diff options
| -rw-r--r-- | MAINTAINERS | 4 | ||||
| -rw-r--r-- | drivers/net/Kconfig | 36 | ||||
| -rw-r--r-- | drivers/net/Makefile | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/Makefile | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/via/Kconfig | 56 | ||||
| -rw-r--r-- | drivers/net/ethernet/via/Makefile | 6 | ||||
| -rw-r--r-- | drivers/net/ethernet/via/via-rhine.c (renamed from drivers/net/via-rhine.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/via/via-velocity.c (renamed from drivers/net/via-velocity.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/via/via-velocity.h (renamed from drivers/net/via-velocity.h) | 0 |
10 files changed, 66 insertions, 40 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index b9acfdee10e8..51d9281a3035 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6988,7 +6988,7 @@ F: include/linux/vhost.h VIA RHINE NETWORK DRIVER M: Roger Luethi <rl@hellgate.ch> S: Maintained -F: drivers/net/via-rhine.c +F: drivers/net/ethernet/via/via-rhine.c VIAPRO SMBUS DRIVER M: Jean Delvare <khali@linux-fr.org> @@ -7016,7 +7016,7 @@ VIA VELOCITY NETWORK DRIVER M: Francois Romieu <romieu@fr.zoreil.com> L: netdev@vger.kernel.org S: Maintained -F: drivers/net/via-velocity.* +F: drivers/net/ethernet/via/via-velocity.* VLAN (802.1Q) M: Patrick McHardy <kaber@trash.net> diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index cb6c6947b320..c1e491add8f9 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -614,30 +614,6 @@ config KS8851_MLL This platform driver is for Micrel KS8851 Address/data bus multiplexed network chip. -config VIA_RHINE - tristate "VIA Rhine support" - depends on NET_PCI && PCI - select CRC32 - select MII - help - If you have a VIA "Rhine" based network card (Rhine-I (VT86C100A), - Rhine-II (VT6102), or Rhine-III (VT6105)), say Y here. Rhine-type - Ethernet functions can also be found integrated on South Bridges - (e.g. VT8235). - - To compile this driver as a module, choose M here. The module - will be called via-rhine. - -config VIA_RHINE_MMIO - bool "Use MMIO instead of PIO" - depends on VIA_RHINE - help - This instructs the driver to use PCI shared memory (MMIO) instead of - programmed I/O ports (PIO). Enabling this gives an improvement in - processing time in parts of the driver. - - If unsure, say Y. - config CPMAC tristate "TI AR7 CPMAC Ethernet support (EXPERIMENTAL)" depends on NET_ETHERNET && EXPERIMENTAL && AR7 @@ -793,18 +769,6 @@ config SIS190 To compile this driver as a module, choose M here: the module will be called sis190. This is recommended. -config VIA_VELOCITY - tristate "VIA Velocity support" - depends on PCI - select CRC32 - select CRC_CCITT - select MII - help - If you have a VIA "Velocity" based network card say Y here. - - To compile this driver as a module, choose M here. The module - will be called via-velocity. - config SPIDER_NET tristate "Spider Gigabit Ethernet driver" depends on PCI && (PPC_IBM_CELL_BLADE || PPC_CELLEB) diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 69ca6a009c59..7e1128fd62bd 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -51,8 +51,6 @@ obj-$(CONFIG_KS8842) += ks8842.o obj-$(CONFIG_KS8851) += ks8851.o obj-$(CONFIG_KS8851_MLL) += ks8851_mll.o obj-$(CONFIG_KSZ884X_PCI) += ksz884x.o -obj-$(CONFIG_VIA_RHINE) += via-rhine.o -obj-$(CONFIG_VIA_VELOCITY) += via-velocity.o obj-$(CONFIG_ADAPTEC_STARFIRE) += starfire.o obj-$(CONFIG_RIONET) += rionet.o obj-$(CONFIG_SH_ETH) += sh_eth.o diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig index 1c447d96d7e5..bdc0df873daf 100644 --- a/drivers/net/ethernet/Kconfig +++ b/drivers/net/ethernet/Kconfig @@ -45,5 +45,6 @@ source "drivers/net/ethernet/smsc/Kconfig" source "drivers/net/ethernet/stmicro/Kconfig" source "drivers/net/ethernet/sun/Kconfig" source "drivers/net/ethernet/tehuti/Kconfig" +source "drivers/net/ethernet/via/Kconfig" endif # ETHERNET diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile index 48c8656b96c2..ac60ac9026bb 100644 --- a/drivers/net/ethernet/Makefile +++ b/drivers/net/ethernet/Makefile @@ -36,3 +36,4 @@ obj-$(CONFIG_NET_VENDOR_SMSC) += smsc/ obj-$(CONFIG_NET_VENDOR_STMICRO) += stmicro/ obj-$(CONFIG_NET_VENDOR_SUN) += sun/ obj-$(CONFIG_NET_VENDOR_TEHUTI) += tehuti/ +obj-$(CONFIG_NET_VENDOR_VIA) += via/ diff --git a/drivers/net/ethernet/via/Kconfig b/drivers/net/ethernet/via/Kconfig new file mode 100644 index 000000000000..7199194fa898 --- /dev/null +++ b/drivers/net/ethernet/via/Kconfig @@ -0,0 +1,56 @@ +# +# VIA device configuration +# + +config NET_VENDOR_VIA + bool "VIA devices" + depends on PCI + ---help--- + If you have a network (Ethernet) card belonging to this class, say Y + and read the Ethernet-HOWTO, available from + <http://www.tldp.org/docs.html#howto>. + + Note that the answer to this question doesn't directly affect the + kernel: saying N will just cause the configurator to skip all + the questions about VIA devices. If you say Y, you will be asked for + your specific card in the following questions. + +if NET_VENDOR_VIA + +config VIA_RHINE + tristate "VIA Rhine support" + depends on PCI + select CRC32 + select MII + ---help--- + If you have a VIA "Rhine" based network card (Rhine-I (VT86C100A), + Rhine-II (VT6102), or Rhine-III (VT6105)), say Y here. Rhine-type + Ethernet functions can also be found integrated on South Bridges + (e.g. VT8235). + + To compile this driver as a module, choose M here. The module + will be called via-rhine. + +config VIA_RHINE_MMIO + bool "Use MMIO instead of PIO" + depends on VIA_RHINE + ---help--- + This instructs the driver to use PCI shared memory (MMIO) instead of + programmed I/O ports (PIO). Enabling this gives an improvement in + processing time in parts of the driver. + + If unsure, say Y. + +config VIA_VELOCITY + tristate "VIA Velocity support" + depends on PCI + select CRC32 + select CRC_CCITT + select MII + ---help--- + If you have a VIA "Velocity" based network card say Y here. + + To compile this driver as a module, choose M here. The module + will be called via-velocity. + +endif # NET_VENDOR_VIA diff --git a/drivers/net/ethernet/via/Makefile b/drivers/net/ethernet/via/Makefile new file mode 100644 index 000000000000..46c5d4a3d8f1 --- /dev/null +++ b/drivers/net/ethernet/via/Makefile @@ -0,0 +1,6 @@ +# +# Makefile for the VIA device drivers. +# + +obj-$(CONFIG_VIA_RHINE) += via-rhine.o +obj-$(CONFIG_VIA_VELOCITY) += via-velocity.o diff --git a/drivers/net/via-rhine.c b/drivers/net/ethernet/via/via-rhine.c index 7f23ab913fd9..7f23ab913fd9 100644 --- a/drivers/net/via-rhine.c +++ b/drivers/net/ethernet/via/via-rhine.c diff --git a/drivers/net/via-velocity.c b/drivers/net/ethernet/via/via-velocity.c index 490ec5b2775a..490ec5b2775a 100644 --- a/drivers/net/via-velocity.c +++ b/drivers/net/ethernet/via/via-velocity.c diff --git a/drivers/net/via-velocity.h b/drivers/net/ethernet/via/via-velocity.h index 4cb9f13485e9..4cb9f13485e9 100644 --- a/drivers/net/via-velocity.h +++ b/drivers/net/ethernet/via/via-velocity.h |