diff options
| -rw-r--r-- | MAINTAINERS | 4 | ||||
| -rw-r--r-- | drivers/net/Kconfig | 30 | ||||
| -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/sis/Kconfig | 50 | ||||
| -rw-r--r-- | drivers/net/ethernet/sis/Makefile | 6 | ||||
| -rw-r--r-- | drivers/net/ethernet/sis/sis190.c (renamed from drivers/net/sis190.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/sis/sis900.c (renamed from drivers/net/sis900.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/sis/sis900.h (renamed from drivers/net/sis900.h) | 0 |
10 files changed, 60 insertions, 34 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 84948bd44b84..96a2d4732e3f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -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> diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 1e1df3d79850..33df2547e30e 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -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 diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 275ed4a548ae..3b14f1a2aa53 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -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 diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig index 97542479c01f..b15b1e2ed398 100644 --- a/drivers/net/ethernet/Kconfig +++ b/drivers/net/ethernet/Kconfig @@ -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" diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile index 7e7a319e7187..1f45ec9a9dca 100644 --- a/drivers/net/ethernet/Makefile +++ b/drivers/net/ethernet/Makefile @@ -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/ diff --git a/drivers/net/ethernet/sis/Kconfig b/drivers/net/ethernet/sis/Kconfig new file mode 100644 index 000000000000..01d43e870eeb --- /dev/null +++ b/drivers/net/ethernet/sis/Kconfig @@ -0,0 +1,50 @@ +# +# Silicon Integrated Systems (SiS) device configuration +# + +config NET_VENDOR_SIS + bool "Silicon Integrated Systems (SiS) 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 SiS devices. If you say Y, you will be asked for + your specific card in the following questions. + +if NET_VENDOR_SIS + +config SIS900 + tristate "SiS 900/7016 PCI Fast Ethernet Adapter support" + depends on 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 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. + +endif # NET_VENDOR_SIS diff --git a/drivers/net/ethernet/sis/Makefile b/drivers/net/ethernet/sis/Makefile new file mode 100644 index 000000000000..58d3ac1985df --- /dev/null +++ b/drivers/net/ethernet/sis/Makefile @@ -0,0 +1,6 @@ +# +# Makefile for Silicon Integrated Systems (SiS) network device drivers. +# + +obj-$(CONFIG_SIS190) += sis190.o +obj-$(CONFIG_SIS900) += sis900.o diff --git a/drivers/net/sis190.c b/drivers/net/ethernet/sis/sis190.c index 3c0f1312b391..3c0f1312b391 100644 --- a/drivers/net/sis190.c +++ b/drivers/net/ethernet/sis/sis190.c diff --git a/drivers/net/sis900.c b/drivers/net/ethernet/sis/sis900.c index 658a1928fe79..658a1928fe79 100644 --- a/drivers/net/sis900.c +++ b/drivers/net/ethernet/sis/sis900.c diff --git a/drivers/net/sis900.h b/drivers/net/ethernet/sis/sis900.h index 150511a922ef..150511a922ef 100644 --- a/drivers/net/sis900.h +++ b/drivers/net/ethernet/sis/sis900.h |