summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2008-08-14 21:26:29 +0000
committerimp <imp@FreeBSD.org>2008-08-14 21:26:29 +0000
commitfb8672b32e58eddf503040adea362f7aec59b536 (patch)
treee0a565bce75bd45bb9a476d846b2b54da5994d70
parent8c7c350b188c9298546fe6bc9eee0182fbf5e7e5 (diff)
downloadFreeBSD-src-fb8672b32e58eddf503040adea362f7aec59b536.zip
FreeBSD-src-fb8672b32e58eddf503040adea362f7aec59b536.tar.gz
Move wb driver from sys/pci to sys/dev/wb.
-rw-r--r--sys/conf/files2
-rw-r--r--sys/dev/wb/if_wb.c (renamed from sys/pci/if_wb.c)2
-rw-r--r--sys/dev/wb/if_wbreg.h (renamed from sys/pci/if_wbreg.h)0
-rw-r--r--sys/modules/wb/Makefile2
4 files changed, 3 insertions, 3 deletions
diff --git a/sys/conf/files b/sys/conf/files
index 1d59a09..6d01ad2 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1328,6 +1328,7 @@ dev/vx/if_vx.c optional vx
dev/vx/if_vx_eisa.c optional vx eisa
dev/vx/if_vx_pci.c optional vx pci
dev/watchdog/watchdog.c standard
+dev/wb/if_wb.c optional wb pci
dev/wds/wd7000.c optional wds isa
dev/wi/if_wi.c optional wi
dev/wi/if_wi_pccard.c optional wi pccard
@@ -2087,7 +2088,6 @@ pci/amdpm.c optional amdpm pci | nfpm pci
pci/amdsmb.c optional amdsmb pci
pci/if_mn.c optional mn pci
pci/if_rl.c optional rl pci
-pci/if_wb.c optional wb pci
pci/intpm.c optional intpm pci
pci/ncr.c optional ncr pci
pci/nfsmb.c optional nfsmb pci
diff --git a/sys/pci/if_wb.c b/sys/dev/wb/if_wb.c
index b652d6d..e3c3295 100644
--- a/sys/pci/if_wb.c
+++ b/sys/dev/wb/if_wb.c
@@ -120,7 +120,7 @@ __FBSDID("$FreeBSD$");
#define WB_USEIOSPACE
-#include <pci/if_wbreg.h>
+#include <dev/wb/if_wbreg.h>
MODULE_DEPEND(wb, pci, 1, 1, 1);
MODULE_DEPEND(wb, ether, 1, 1, 1);
diff --git a/sys/pci/if_wbreg.h b/sys/dev/wb/if_wbreg.h
index c5315c4..c5315c4 100644
--- a/sys/pci/if_wbreg.h
+++ b/sys/dev/wb/if_wbreg.h
diff --git a/sys/modules/wb/Makefile b/sys/modules/wb/Makefile
index 2f32cd3..77b63b5 100644
--- a/sys/modules/wb/Makefile
+++ b/sys/modules/wb/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../pci
+.PATH: ${.CURDIR}/../../dev/wb
KMOD= if_wb
SRCS= if_wb.c device_if.h
OpenPOWER on IntegriCloud