aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/mips/configs/bigsur_defconfig2
-rw-r--r--arch/mips/configs/sb1250-swarm_defconfig2
-rw-r--r--drivers/net/Kconfig2
-rw-r--r--drivers/net/Makefile2
4 files changed, 4 insertions, 4 deletions
diff --git a/arch/mips/configs/bigsur_defconfig b/arch/mips/configs/bigsur_defconfig
index 700a3a2d688e..9861fe670d89 100644
--- a/arch/mips/configs/bigsur_defconfig
+++ b/arch/mips/configs/bigsur_defconfig
@@ -574,7 +574,7 @@ CONFIG_MII=y
574# CONFIG_HAMACHI is not set 574# CONFIG_HAMACHI is not set
575# CONFIG_YELLOWFIN is not set 575# CONFIG_YELLOWFIN is not set
576# CONFIG_R8169 is not set 576# CONFIG_R8169 is not set
577CONFIG_NET_SB1250_MAC=y 577CONFIG_SB1250_MAC=y
578# CONFIG_SIS190 is not set 578# CONFIG_SIS190 is not set
579# CONFIG_SKGE is not set 579# CONFIG_SKGE is not set
580# CONFIG_SKY2 is not set 580# CONFIG_SKY2 is not set
diff --git a/arch/mips/configs/sb1250-swarm_defconfig b/arch/mips/configs/sb1250-swarm_defconfig
index 93f9e8331ad7..2f28557f3d72 100644
--- a/arch/mips/configs/sb1250-swarm_defconfig
+++ b/arch/mips/configs/sb1250-swarm_defconfig
@@ -566,7 +566,7 @@ CONFIG_MII=y
566# CONFIG_HAMACHI is not set 566# CONFIG_HAMACHI is not set
567# CONFIG_YELLOWFIN is not set 567# CONFIG_YELLOWFIN is not set
568# CONFIG_R8169 is not set 568# CONFIG_R8169 is not set
569CONFIG_NET_SB1250_MAC=y 569CONFIG_SB1250_MAC=y
570# CONFIG_SIS190 is not set 570# CONFIG_SIS190 is not set
571# CONFIG_SKGE is not set 571# CONFIG_SKGE is not set
572# CONFIG_SKY2 is not set 572# CONFIG_SKY2 is not set
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 53615374f16a..467532c7975c 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2123,7 +2123,7 @@ config R8169_VLAN
2123 2123
2124 If in doubt, say Y. 2124 If in doubt, say Y.
2125 2125
2126config NET_SB1250_MAC 2126config SB1250_MAC
2127 tristate "SB1250 Gigabit Ethernet support" 2127 tristate "SB1250 Gigabit Ethernet support"
2128 depends on SIBYTE_SB1xxx_SOC 2128 depends on SIBYTE_SB1xxx_SOC
2129 ---help--- 2129 ---help---
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 9cbef5829870..6220c50596ec 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -111,7 +111,7 @@ obj-$(CONFIG_E2100) += e2100.o 8390.o
111obj-$(CONFIG_ES3210) += es3210.o 8390.o 111obj-$(CONFIG_ES3210) += es3210.o 8390.o
112obj-$(CONFIG_LNE390) += lne390.o 8390.o 112obj-$(CONFIG_LNE390) += lne390.o 8390.o
113obj-$(CONFIG_NE3210) += ne3210.o 8390.o 113obj-$(CONFIG_NE3210) += ne3210.o 8390.o
114obj-$(CONFIG_NET_SB1250_MAC) += sb1250-mac.o 114obj-$(CONFIG_SB1250_MAC) += sb1250-mac.o
115obj-$(CONFIG_B44) += b44.o 115obj-$(CONFIG_B44) += b44.o
116obj-$(CONFIG_FORCEDETH) += forcedeth.o 116obj-$(CONFIG_FORCEDETH) += forcedeth.o
117obj-$(CONFIG_NE_H8300) += ne-h8300.o 117obj-$(CONFIG_NE_H8300) += ne-h8300.o