[PATCH] Enable E1000E in x86-64/i386 defconfig

[Andi Kleen]

Enable E1000E in x86-64/i386 defconfig

That one is a little late, but it would be great if it was considered
for .26 final. Thanks.

-Andi

----

Hit me a few times now: the x86 defconfigs should really enable E1000E,
otherwise kernel build on defconfig don't work anymore if the test box
has a new enough E1000. Previously that worked because e1000 supported
these devices too.

I think enabling it by default gives a smoother transition. Auke
used to have a patch for this too, but it seems to be still not there
in rc8.

BTW it would be probably good to rerun make oldconfig on the x86 defconfigs
at some point. They seem to be a little outdated and generate a huge
diff against a updated oldconfig.

Signed-off-by: Andi Kleen <ak@xxxxxxxxxxxxxxx>
Cc: jeffrey.t.kirsher@xxxxxxxxx

Index: linux/arch/x86/configs/i386_defconfig
===================================================================
--- linux.orig/arch/x86/configs/i386_defconfig
+++ linux/arch/x86/configs/i386_defconfig
@@ -814,6 +814,8 @@ CONFIG_NETDEV_1000=y
 CONFIG_E1000=y
 # CONFIG_E1000_NAPI is not set
 # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
+CONFIG_E1000E=y
+CONFIG_E1000E_ENABLED=y
 # CONFIG_NS83820 is not set
 # CONFIG_HAMACHI is not set
 # CONFIG_YELLOWFIN is not set
Index: linux/arch/x86/configs/x86_64_defconfig
===================================================================
--- linux.orig/arch/x86/configs/x86_64_defconfig
+++ linux/arch/x86/configs/x86_64_defconfig
@@ -738,6 +738,8 @@ CONFIG_NETDEV_1000=y
 # CONFIG_ACENIC is not set
 # CONFIG_DL2K is not set
 CONFIG_E1000=y
+CONFIG_E1000E=y
+CONFIG_E1000E_ENABLED=y
 # CONFIG_E1000_NAPI is not set
 # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
 # CONFIG_NS83820 is not set
--
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/