---

yaml --- r: 66648 b: refs/heads/master c: 25a72df h: refs/heads/master v: v3
git-mirror · Oct 10, 2007 · c8ca351 · c8ca351
1 parent ecd2eac
commit c8ca351
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 200eef20db6de7535438c9af9becc8169c6cb6c0
+refs/heads/master: 25a72dfe044a716222d7adb4f075afc62ed4061f
diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig
@@ -481,10 +481,6 @@ config MIPS_AU1X00_ENET
 	  If you have an Alchemy Semi AU1X00 based system
 	  say Y.  Otherwise, say N.
 
-config NET_SB1250_MAC
-	tristate "SB1250 Ethernet support"
-	depends on SIBYTE_SB1xxx_SOC
-
 config SGI_IOC3_ETH
 	bool "SGI IOC3 Ethernet"
 	depends on PCI && SGI_IP27
@@ -2127,6 +2123,18 @@ config R8169_VLAN
 
 	  If in doubt, say Y.
 
+config NET_SB1250_MAC
+	tristate "SB1250 Gigabit Ethernet support"
+	depends on SIBYTE_SB1xxx_SOC
+	---help---
+	  This driver supports Gigabit Ethernet interfaces based on the
+	  Broadcom SiByte family of System-On-a-Chip parts.  They include
+	  the BCM1120, BCM1125, BCM1125H, BCM1250, BCM1255, BCM1280, BCM1455
+	  and BCM1480 chips.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called sb1250-mac.
+
 config SIS190
 	tristate "SiS190/SiS191 gigabit ethernet support"
 	depends on PCI