diff options
| author | imp <imp@FreeBSD.org> | 2008-08-10 09:45:52 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2008-08-10 09:45:52 +0000 |
| commit | eefa09e8e9f0c2a49f9ab794445a8c081bf2cdbc (patch) | |
| tree | 26ead7144107d033b293c6ec81314e8ad4e94607 | |
| parent | 55e9379b978a485f3fde8543e8e5fe352aabbdd1 (diff) | |
| download | FreeBSD-src-eefa09e8e9f0c2a49f9ab794445a8c081bf2cdbc.zip FreeBSD-src-eefa09e8e9f0c2a49f9ab794445a8c081bf2cdbc.tar.gz | |
Move the xl driver form sys/pci to sys/dev/xl for consistency.
| -rw-r--r-- | sys/conf/files | 2 | ||||
| -rw-r--r-- | sys/dev/xl/if_xl.c (renamed from sys/pci/if_xl.c) | 5 | ||||
| -rw-r--r-- | sys/dev/xl/if_xlreg.h (renamed from sys/pci/if_xlreg.h) | 0 | ||||
| -rw-r--r-- | sys/modules/xl/Makefile | 2 |
4 files changed, 3 insertions, 6 deletions
diff --git a/sys/conf/files b/sys/conf/files index 728d6a0..fdf7142 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1346,6 +1346,7 @@ wpi.fw optional wpifw \ clean "wpi.fw" dev/xe/if_xe.c optional xe dev/xe/if_xe_pccard.c optional xe pccard +dev/xl/if_xl.c optional xl pci fs/coda/coda_fbsd.c optional vcoda fs/coda/coda_psdev.c optional vcoda fs/coda/coda_subr.c optional vcoda @@ -2088,7 +2089,6 @@ pci/if_sis.c optional sis pci pci/if_ste.c optional ste pci pci/if_tl.c optional tl pci pci/if_wb.c optional wb pci -pci/if_xl.c optional xl 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_xl.c b/sys/dev/xl/if_xl.c index 341f628..d7c45ab 100644 --- a/sys/pci/if_xl.c +++ b/sys/dev/xl/if_xl.c @@ -96,9 +96,6 @@ __FBSDID("$FreeBSD$"); * Since using bus master DMA is a big win, we use this driver to * support the PCI "boomerang" chips even though they work with the * "vortex" driver in order to obtain better performance. - * - * This driver is in the /sys/pci directory because it only supports - * PCI-based NICs. */ #ifdef HAVE_KERNEL_OPTION_HEADERS @@ -142,7 +139,7 @@ MODULE_DEPEND(xl, miibus, 1, 1, 1); /* "device miibus" required. See GENERIC if you get errors here. */ #include "miibus_if.h" -#include <pci/if_xlreg.h> +#include <dev/xl/if_xlreg.h> /* * TX Checksumming is disabled by default for two reasons: diff --git a/sys/pci/if_xlreg.h b/sys/dev/xl/if_xlreg.h index 5386614..5386614 100644 --- a/sys/pci/if_xlreg.h +++ b/sys/dev/xl/if_xlreg.h diff --git a/sys/modules/xl/Makefile b/sys/modules/xl/Makefile index 637da41..3898ad4 100644 --- a/sys/modules/xl/Makefile +++ b/sys/modules/xl/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../pci +.PATH: ${.CURDIR}/../../dev/xl KMOD= if_xl SRCS= if_xl.c device_if.h bus_if.h pci_if.h |
