Move wb driver from sys/pci to sys/dev/wb.

2008-08-14 21:26:29 +00:00 · 2008-08-14 21:26:29 +00:00 · 7e5dc2f88f
commit 7e5dc2f88f
parent 5d5325f82c
4 changed files with 3 additions and 3 deletions
--- 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
--- a/sys/dev/wb/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);
--- a/sys/dev/wb/if_wbreg.h
+++ b/sys/dev/wb/if_wbreg.h
--- 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