The Kconfig option NET_SB1250_MAC is listed in different places in drivers/net/Kconfig in the Linus' and linux-mips trees. Bring them into sync. Signed-off-by: Martin Michlmayr <tbm@xxxxxxxxxx> --- mips.git/drivers/net/Kconfig 2006-03-13 18:43:52.000000000 +0000 +++ linux-2.6/drivers/net/Kconfig 2006-03-13 18:55:59.000000000 +0000 @@ -460,6 +452,10 @@ If you have an Alchemy Semi AU1X00 based system say Y. Otherwise, say N. +config NET_SB1250_MAC + tristate "SB1250 Ethernet support" + depends on NET_ETHERNET && SIBYTE_SB1xxx_SOC + config SGI_IOC3_ETH bool "SGI IOC3 Ethernet" depends on NET_ETHERNET && PCI && SGI_IP27 @@ -2009,10 +1997,6 @@ If in doubt, say N. -config NET_SB1250_MAC - tristate "SB1250 Ethernet support" - depends on SIBYTE_SB1xxx_SOC - config R8169_VLAN bool "VLAN support" depends on R8169 && VLAN_8021Q -- Martin Michlmayr http://www.cyrius.com/
