diff options
Diffstat (limited to 'drivers/net/Kconfig')
-rw-r--r-- | drivers/net/Kconfig | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index ebd7313d7fc1..e2fa29b612cd 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
@@ -1901,6 +1901,8 @@ config E1000_NAPI | |||
1901 | 1901 | ||
1902 | If in doubt, say N. | 1902 | If in doubt, say N. |
1903 | 1903 | ||
1904 | source "drivers/net/ixp2000/Kconfig" | ||
1905 | |||
1904 | config MYRI_SBUS | 1906 | config MYRI_SBUS |
1905 | tristate "MyriCOM Gigabit Ethernet support" | 1907 | tristate "MyriCOM Gigabit Ethernet support" |
1906 | depends on SBUS | 1908 | depends on SBUS |
@@ -2008,7 +2010,18 @@ config SKGE | |||
2008 | 2010 | ||
2009 | It does not support the link failover and network management | 2011 | It does not support the link failover and network management |
2010 | features that "portable" vendor supplied sk98lin driver does. | 2012 | features that "portable" vendor supplied sk98lin driver does. |
2011 | 2013 | ||
2014 | |||
2015 | config SKY2 | ||
2016 | tristate "SysKonnect Yukon2 support (EXPERIMENTAL)" | ||
2017 | depends on PCI && EXPERIMENTAL | ||
2018 | select CRC32 | ||
2019 | ---help--- | ||
2020 | This driver support the Marvell Yukon 2 Gigabit Ethernet adapter. | ||
2021 | |||
2022 | To compile this driver as a module, choose M here: the module | ||
2023 | will be called sky2. This is recommended. | ||
2024 | |||
2012 | config SK98LIN | 2025 | config SK98LIN |
2013 | tristate "Marvell Yukon Chipset / SysKonnect SK-98xx Support" | 2026 | tristate "Marvell Yukon Chipset / SysKonnect SK-98xx Support" |
2014 | depends on PCI | 2027 | depends on PCI |
@@ -2120,7 +2133,7 @@ config BNX2 | |||
2120 | 2133 | ||
2121 | config SPIDER_NET | 2134 | config SPIDER_NET |
2122 | tristate "Spider Gigabit Ethernet driver" | 2135 | tristate "Spider Gigabit Ethernet driver" |
2123 | depends on PCI && PPC_BPA | 2136 | depends on PCI && PPC_CELL |
2124 | help | 2137 | help |
2125 | This driver supports the Gigabit Ethernet chips present on the | 2138 | This driver supports the Gigabit Ethernet chips present on the |
2126 | Cell Processor-Based Blades from IBM. | 2139 | Cell Processor-Based Blades from IBM. |