2.6.7-rc2-mm1 lost gigabit ethernet config

[Klink]

Running "make oldconfig" on a .config from 2.6.6-mm4 in the
2.6.7-rc2-mm1 directory results in loss of gigabit ethernet config
vars

2.6.6-mm4 .config:

# Ethernet (10 or 100Mbit)
#
# CONFIG_NET_ETHERNET is not set

#
# Ethernet (1000 Mbit)
#
# CONFIG_ACENIC is not set
# CONFIG_DL2K is not set
CONFIG_E1000=y
# CONFIG_E1000_NAPI is not set
# CONFIG_NS83820 is not set
# CONFIG_HAMACHI is not set
# CONFIG_YELLOWFIN is not set
# CONFIG_R8169 is not set
# CONFIG_SK98LIN is not set
# CONFIG_TIGON3 is not set

#
# Ethernet (10000 Mbit)
#
# CONFIG_IXGB is not set
# CONFIG_S2IO is not set

#
------------------------------------------------------------------

2.6.7-rc2-mm1 .config

#
# Ethernet (10 or 100Mbit)
#
# CONFIG_NET_ETHERNET is not set

#
# Gigabit Ethernet (1000/10000 Mbit)
#

#
# Token Ring devices
#
# CONFIG_TR is not set

------------------------------------------------------------------

It seems to be because of the merger of 1000/10000 MBit and not the
patching.


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/