Module Name: src
Committed By: dyoung
Date: Sun Jul 17 00:52:42 UTC 2011
Modified Files:
src/sys/dev/nor: cfi.c cfi.h cfi_0002.c nor.h
Log Message:
#include <sys/bus.h> not <machine/bus.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/nor/cfi.c src/sys/dev/nor/cfi_0002.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/nor/cfi.h src/sys/dev/nor/nor.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/nor/cfi.c
diff -u src/sys/dev/nor/cfi.c:1.1 src/sys/dev/nor/cfi.c:1.2
--- src/sys/dev/nor/cfi.c:1.1 Fri Jul 15 19:19:57 2011
+++ src/sys/dev/nor/cfi.c Sun Jul 17 00:52:42 2011
@@ -1,10 +1,10 @@
-/* $NetBSD: cfi.c,v 1.1 2011/07/15 19:19:57 cliff Exp $ */
+/* $NetBSD: cfi.c,v 1.2 2011/07/17 00:52:42 dyoung Exp $ */
#include "opt_nor.h"
#include "opt_flash.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cfi.c,v 1.1 2011/07/15 19:19:57 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cfi.c,v 1.2 2011/07/17 00:52:42 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -12,7 +12,7 @@
#include <sys/device.h>
#include <sys/endian.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/nor/nor.h>
#include <dev/nor/cfi.h>
Index: src/sys/dev/nor/cfi_0002.c
diff -u src/sys/dev/nor/cfi_0002.c:1.1 src/sys/dev/nor/cfi_0002.c:1.2
--- src/sys/dev/nor/cfi_0002.c:1.1 Fri Jul 15 19:19:57 2011
+++ src/sys/dev/nor/cfi_0002.c Sun Jul 17 00:52:42 2011
@@ -1,9 +1,9 @@
-/* $NetBSD: cfi_0002.c,v 1.1 2011/07/15 19:19:57 cliff Exp $ */
+/* $NetBSD: cfi_0002.c,v 1.2 2011/07/17 00:52:42 dyoung Exp $ */
#include "opt_flash.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cfi_0002.c,v 1.1 2011/07/15 19:19:57 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cfi_0002.c,v 1.2 2011/07/17 00:52:42 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -12,7 +12,7 @@
#include <sys/endian.h>
#include <sys/time.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/nor/nor.h>
#include <dev/nor/cfi.h>
Index: src/sys/dev/nor/cfi.h
diff -u src/sys/dev/nor/cfi.h:1.2 src/sys/dev/nor/cfi.h:1.3
--- src/sys/dev/nor/cfi.h:1.2 Fri Jul 15 19:19:57 2011
+++ src/sys/dev/nor/cfi.h Sun Jul 17 00:52:42 2011
@@ -1,10 +1,10 @@
-/* $NetBSD: cfi.h,v 1.2 2011/07/15 19:19:57 cliff Exp $ */
+/* $NetBSD: cfi.h,v 1.3 2011/07/17 00:52:42 dyoung Exp $ */
#ifndef _CFI_H_
#define _CFI_H_
#include <dev/nor/cfi_0002.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
/*
* minimum size to bus_space_map for probe/identify QRY:
Index: src/sys/dev/nor/nor.h
diff -u src/sys/dev/nor/nor.h:1.2 src/sys/dev/nor/nor.h:1.3
--- src/sys/dev/nor/nor.h:1.2 Fri Jul 15 19:19:57 2011
+++ src/sys/dev/nor/nor.h Sun Jul 17 00:52:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: nor.h,v 1.2 2011/07/15 19:19:57 cliff Exp $ */
+/* $NetBSD: nor.h,v 1.3 2011/07/17 00:52:42 dyoung Exp $ */
/*-
* Copyright (c) 2011 Department of Software Engineering,
@@ -41,7 +41,7 @@
#include <sys/buf.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/flash/flash.h>
#include <dev/flash/flash_io.h>
