diff options
| author | Maciej W. Rozycki <macro@linux-mips.org> | 2007-09-14 07:05:00 -0400 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:51:54 -0400 |
| commit | 1a9e8549efda23a08451d0ac582713dfd04f0951 (patch) | |
| tree | 159346c51d893a1fdc79bedf6a312435dc8f9135 | |
| parent | 25a72dfe044a716222d7adb4f075afc62ed4061f (diff) | |
NET_SB1250_MAC: Rename to SB1250_MAC
Rename NET_SB1250_MAC to SB1250_MAC to follow the convention.
Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
| -rw-r--r-- | arch/mips/configs/bigsur_defconfig | 2 | ||||
| -rw-r--r-- | arch/mips/configs/sb1250-swarm_defconfig | 2 | ||||
| -rw-r--r-- | drivers/net/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/net/Makefile | 2 |
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 |
| 577 | CONFIG_NET_SB1250_MAC=y | 577 | CONFIG_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 |
| 569 | CONFIG_NET_SB1250_MAC=y | 569 | CONFIG_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 | ||
| 2126 | config NET_SB1250_MAC | 2126 | config 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 | |||
| 111 | obj-$(CONFIG_ES3210) += es3210.o 8390.o | 111 | obj-$(CONFIG_ES3210) += es3210.o 8390.o |
| 112 | obj-$(CONFIG_LNE390) += lne390.o 8390.o | 112 | obj-$(CONFIG_LNE390) += lne390.o 8390.o |
| 113 | obj-$(CONFIG_NE3210) += ne3210.o 8390.o | 113 | obj-$(CONFIG_NE3210) += ne3210.o 8390.o |
| 114 | obj-$(CONFIG_NET_SB1250_MAC) += sb1250-mac.o | 114 | obj-$(CONFIG_SB1250_MAC) += sb1250-mac.o |
| 115 | obj-$(CONFIG_B44) += b44.o | 115 | obj-$(CONFIG_B44) += b44.o |
| 116 | obj-$(CONFIG_FORCEDETH) += forcedeth.o | 116 | obj-$(CONFIG_FORCEDETH) += forcedeth.o |
| 117 | obj-$(CONFIG_NE_H8300) += ne-h8300.o | 117 | obj-$(CONFIG_NE_H8300) += ne-h8300.o |