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/sun/cgsix.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/dev/sun/cgsix.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.34
retrieving revision 1.34.2.1
diff -u -p -r1.34 -r1.34.2.1
--- src/sys/dev/sun/cgsix.c	2007/03/04 06:02:44	1.34
+++ src/sys/dev/sun/cgsix.c	2007/10/23 20:09:44	1.34.2.1
@@ -1,4 +1,4 @@
-/*	$NetBSD: cgsix.c,v 1.34 2007/03/04 06:02:44 christos Exp $ */
+/*	$NetBSD: cgsix.c,v 1.34.2.1 2007/10/23 20:09:44 ad Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -85,7 +85,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgsix.c,v 1.34 2007/03/04 06:02:44 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgsix.c,v 1.34.2.1 2007/10/23 20:09:44 ad Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -104,7 +104,7 @@ __KERNEL_RCSID(0, "$NetBSD: cgsix.c,v 1.
 
 #include <uvm/uvm_extern.h>
 
-#include <machine/bus.h>
+#include <sys/bus.h>
 
 #include <dev/sun/fbio.h>
 #include <dev/sun/fbvar.h>