Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/dev/isa/if_cs_isa.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/dev/isa/if_cs_isa.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.18
retrieving revision 1.18.28.1
diff -u -p -r1.18 -r1.18.28.1
--- src/sys/dev/isa/if_cs_isa.c	2006/11/16 01:33:00	1.18
+++ src/sys/dev/isa/if_cs_isa.c	2007/10/25 22:38:13	1.18.28.1
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_cs_isa.c,v 1.18 2006/11/16 01:33:00 christos Exp $	*/
+/*	$NetBSD: if_cs_isa.c,v 1.18.28.1 2007/10/25 22:38:13 bouyer Exp $	*/
 
 /*
  * Copyright 1997
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cs_isa.c,v 1.18 2006/11/16 01:33:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cs_isa.c,v 1.18.28.1 2007/10/25 22:38:13 bouyer Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -50,8 +50,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_cs_isa.c,
 #include <net/if_ether.h>
 #include <net/if_media.h>
 
-#include <machine/bus.h>
-#include <machine/intr.h>
+#include <sys/bus.h>
+#include <sys/intr.h>
 
 #include <dev/isa/isareg.h>
 #include <dev/isa/isavar.h>