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

Commit 8c7de408 authored by Jeff Kirsher's avatar Jeff Kirsher
Browse files

sis*: Move the Silicon Integrated Systems (SiS) drivers 



Move the SiS drivers into drivers/net/ethernet/sis/ and make the
necessary Kconfig and Makefile changes

CC: Daniele Venzano <venza@brownhat.org>
CC: Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 4c78893b

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -5820,14 +5820,14 @@ SIS 190 ETHERNET DRIVER 
M:	Francois Romieu <romieu@fr.zoreil.com>

L:	netdev@vger.kernel.org

S:	Maintained

F:	drivers/net/sis190.c

F:	drivers/net/ethernet/sis/sis190.c



SIS 900/7016 FAST ETHERNET DRIVER

M:	Daniele Venzano <venza@brownhat.org>

W:	http://www.brownhat.org/sis900.html

L:	netdev@vger.kernel.org

S:	Maintained

F:	drivers/net/sis900.*

F:	drivers/net/ethernet/sis/sis900.*



SIS 96X I2C/SMBUS DRIVER

M:	"Mark M. Hoffman" <mhoffman@lightlink.com>

drivers/net/Kconfig

+0 −30
Original line number Diff line number Diff line
@@ -500,22 +500,6 @@ config R6040 
	  To compile this driver as a module, choose M here: the module

	  will be called r6040. This is recommended.



config SIS900

	tristate "SiS 900/7016 PCI Fast Ethernet Adapter support"

	depends on NET_PCI && PCI

	select CRC32

	select MII

	---help---

	  This is a driver for the Fast Ethernet PCI network cards based on

	  the SiS 900 and SiS 7016 chips. The SiS 900 core is also embedded in

	  SiS 630 and SiS 540 chipsets.



	  This driver also supports AMD 79C901 HomePNA so that you can use

	  your phone line as a network cable.



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

	  will be called sis900.  This is recommended.



config TLAN

	tristate "TI ThunderLAN support"

	depends on NET_PCI && (PCI || EISA)
@@ -639,20 +623,6 @@ config YELLOWFIN 
	  To compile this driver as a module, choose M here: the module

	  will be called yellowfin.  This is recommended.



config SIS190

	tristate "SiS190/SiS191 gigabit ethernet support"

	depends on PCI

	select CRC32

	select MII

	---help---

	  Say Y here if you have a SiS 190 PCI Fast Ethernet adapter or

	  a SiS 191 PCI Gigabit Ethernet adapter. Both are expected to

	  appear in lan on motherboard designs which are based on SiS 965

	  and SiS 966 south bridge.



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

	  will be called sis190.  This is recommended.



config TSI108_ETH

	tristate "Tundra TSI108 gigabit Ethernet support"

	depends on TSI108_BRIDGE

drivers/net/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -24,8 +24,6 @@ obj-$(CONFIG_PLIP) += plip.o 
obj-$(CONFIG_ROADRUNNER) += rrunner.o



obj-$(CONFIG_TLAN) += tlan.o

obj-$(CONFIG_SIS190) += sis190.o

obj-$(CONFIG_SIS900) += sis900.o

obj-$(CONFIG_R6040) += r6040.o

obj-$(CONFIG_YELLOWFIN) += yellowfin.o

obj-$(CONFIG_FEALNX) += fealnx.o

drivers/net/ethernet/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ source "drivers/net/ethernet/qlogic/Kconfig" 
source "drivers/net/ethernet/racal/Kconfig"

source "drivers/net/ethernet/realtek/Kconfig"

source "drivers/net/ethernet/seeq/Kconfig"

source "drivers/net/ethernet/sis/Kconfig"

source "drivers/net/ethernet/sfc/Kconfig"

source "drivers/net/ethernet/sgi/Kconfig"

source "drivers/net/ethernet/smsc/Kconfig"

drivers/net/ethernet/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/ 
obj-$(CONFIG_NET_VENDOR_RACAL) += racal/

obj-$(CONFIG_NET_VENDOR_REALTEK) += realtek/

obj-$(CONFIG_NET_VENDOR_SEEQ) += seeq/

obj-$(CONFIG_NET_VENDOR_SIS) += sis/

obj-$(CONFIG_SFC) += sfc/

obj-$(CONFIG_NET_VENDOR_SGI) += sgi/

obj-$(CONFIG_NET_VENDOR_SMSC) += smsc/