aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorMaciej W. Rozycki <macro@linux-mips.org>2007-09-14 06:57:33 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 19:51:53 -0400
commit25a72dfe044a716222d7adb4f075afc62ed4061f (patch)
treebe3ff9f6c759444f4fc3f157271de4d20f72c20f /drivers/net
parent200eef20db6de7535438c9af9becc8169c6cb6c0 (diff)
NET_SB1250_MAC: Update Kconfig entry
The SB1250 network interfaces are Gigabit Ethernet ones. Move the Kconfig entry to the appropriate section and add some help text. Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/Kconfig16
1 files changed, 12 insertions, 4 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index cfa97f3fbebd..53615374f16a 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -481,10 +481,6 @@ config MIPS_AU1X00_ENET
481 If you have an Alchemy Semi AU1X00 based system 481 If you have an Alchemy Semi AU1X00 based system
482 say Y. Otherwise, say N. 482 say Y. Otherwise, say N.
483 483
484config NET_SB1250_MAC
485 tristate "SB1250 Ethernet support"
486 depends on SIBYTE_SB1xxx_SOC
487
488config SGI_IOC3_ETH 484config SGI_IOC3_ETH
489 bool "SGI IOC3 Ethernet" 485 bool "SGI IOC3 Ethernet"
490 depends on PCI && SGI_IP27 486 depends on PCI && SGI_IP27
@@ -2127,6 +2123,18 @@ config R8169_VLAN
2127 2123
2128 If in doubt, say Y. 2124 If in doubt, say Y.
2129 2125
2126config NET_SB1250_MAC
2127 tristate "SB1250 Gigabit Ethernet support"
2128 depends on SIBYTE_SB1xxx_SOC
2129 ---help---
2130 This driver supports Gigabit Ethernet interfaces based on the
2131 Broadcom SiByte family of System-On-a-Chip parts. They include
2132 the BCM1120, BCM1125, BCM1125H, BCM1250, BCM1255, BCM1280, BCM1455
2133 and BCM1480 chips.
2134
2135 To compile this driver as a module, choose M here: the module
2136 will be called sb1250-mac.
2137
2130config SIS190 2138config SIS190
2131 tristate "SiS190/SiS191 gigabit ethernet support" 2139 tristate "SiS190/SiS191 gigabit ethernet support"
2132 depends on PCI 2140 depends on PCI