Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2148a47 authored by Jeff Kirsher's avatar Jeff Kirsher
Browse files

via-*: Move the VIA drivers 



Move the VIA drivers into drivers/net/ethernet/via/ and make the
necessary Kconfig and Makefile changes.

CC: Roger Luethi <rl@hellgate.ch>
CC: Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 527a6266

MAINTAINERS

+2 −2
Original line number Original line Diff line number Diff line
@@ -6988,7 +6988,7 @@ F: include/linux/vhost.h 
VIA RHINE NETWORK DRIVER

VIA RHINE NETWORK DRIVER

M:	Roger Luethi <rl@hellgate.ch>

M:	Roger Luethi <rl@hellgate.ch>

S:	Maintained

S:	Maintained

F:	drivers/net/via-rhine.c

F:	drivers/net/ethernet/via/via-rhine.c





VIAPRO SMBUS DRIVER

VIAPRO SMBUS DRIVER

M:	Jean Delvare <khali@linux-fr.org>

M:	Jean Delvare <khali@linux-fr.org>
@@ -7016,7 +7016,7 @@ VIA VELOCITY NETWORK DRIVER 
M:	Francois Romieu <romieu@fr.zoreil.com>

M:	Francois Romieu <romieu@fr.zoreil.com>

L:	netdev@vger.kernel.org

L:	netdev@vger.kernel.org

S:	Maintained

S:	Maintained

F:	drivers/net/via-velocity.*

F:	drivers/net/ethernet/via/via-velocity.*





VLAN (802.1Q)

VLAN (802.1Q)

M:	Patrick McHardy <kaber@trash.net>

M:	Patrick McHardy <kaber@trash.net>

drivers/net/Kconfig

+0 −36
Original line number Original line Diff line number Diff line
@@ -614,30 +614,6 @@ config KS8851_MLL 
	  This platform driver is for Micrel KS8851 Address/data bus

	  This platform driver is for Micrel KS8851 Address/data bus

	  multiplexed network chip.

	  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

config CPMAC

	tristate "TI AR7 CPMAC Ethernet support (EXPERIMENTAL)"

	tristate "TI AR7 CPMAC Ethernet support (EXPERIMENTAL)"

	depends on NET_ETHERNET && EXPERIMENTAL && AR7

	depends on NET_ETHERNET && EXPERIMENTAL && AR7
@@ -793,18 +769,6 @@ config SIS190 
	  To compile this driver as a module, choose M here: the module

	  To compile this driver as a module, choose M here: the module

	  will be called sis190.  This is recommended.

	  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

config SPIDER_NET

	tristate "Spider Gigabit Ethernet driver"

	tristate "Spider Gigabit Ethernet driver"

	depends on PCI && (PPC_IBM_CELL_BLADE || PPC_CELLEB)

	depends on PCI && (PPC_IBM_CELL_BLADE || PPC_CELLEB)

drivers/net/Makefile

+0 −2
Original line number Original line Diff line number Diff line
@@ -51,8 +51,6 @@ obj-$(CONFIG_KS8842) += ks8842.o 
obj-$(CONFIG_KS8851)	+= ks8851.o

obj-$(CONFIG_KS8851)	+= ks8851.o

obj-$(CONFIG_KS8851_MLL)	+= ks8851_mll.o

obj-$(CONFIG_KS8851_MLL)	+= ks8851_mll.o

obj-$(CONFIG_KSZ884X_PCI)	+= ksz884x.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_ADAPTEC_STARFIRE) += starfire.o

obj-$(CONFIG_RIONET) += rionet.o

obj-$(CONFIG_RIONET) += rionet.o

obj-$(CONFIG_SH_ETH) += sh_eth.o

obj-$(CONFIG_SH_ETH) += sh_eth.o

drivers/net/ethernet/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -45,5 +45,6 @@ source "drivers/net/ethernet/smsc/Kconfig" 
source "drivers/net/ethernet/stmicro/Kconfig"

source "drivers/net/ethernet/stmicro/Kconfig"

source "drivers/net/ethernet/sun/Kconfig"

source "drivers/net/ethernet/sun/Kconfig"

source "drivers/net/ethernet/tehuti/Kconfig"

source "drivers/net/ethernet/tehuti/Kconfig"

source "drivers/net/ethernet/via/Kconfig"





endif # ETHERNET
 
endif # ETHERNET

drivers/net/ethernet/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -36,3 +36,4 @@ obj-$(CONFIG_NET_VENDOR_SMSC) += smsc/ 
obj-$(CONFIG_NET_VENDOR_STMICRO) += stmicro/

obj-$(CONFIG_NET_VENDOR_STMICRO) += stmicro/

obj-$(CONFIG_NET_VENDOR_SUN) += sun/

obj-$(CONFIG_NET_VENDOR_SUN) += sun/

obj-$(CONFIG_NET_VENDOR_TEHUTI) += tehuti/

obj-$(CONFIG_NET_VENDOR_TEHUTI) += tehuti/

obj-$(CONFIG_NET_VENDOR_VIA) += via/