diff options
| author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-06-13 08:43:49 -0700 |
|---|---|---|
| committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-08-12 03:40:44 -0700 |
| commit | 8c7de408fd2caa11b8b3a1ed8a1b141ce127ad4e (patch) | |
| tree | 19886abfa361eebc0113143263e593909b88b259 /drivers/net/Kconfig | |
| parent | 4c78893b3d107e2a053c8f51c526510857c09858 (diff) | |
| download | linux-8c7de408fd2caa11b8b3a1ed8a1b141ce127ad4e.tar.gz | |
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: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/Kconfig')
| -rw-r--r-- | drivers/net/Kconfig | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 1e1df3d79850fd..33df2547e30ed2 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 |