From e206629d59d14852e1b0089961f74e5e4cbac452 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 29 Apr 2011 22:26:37 +0200 Subject: [PATCH] projects/Intel/linux: add e1000 network driver Signed-off-by: Stephan Raue --- projects/Intel/linux/linux.i386.conf | 5 ++--- projects/Intel/linux/linux.x86_64.conf | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/projects/Intel/linux/linux.i386.conf b/projects/Intel/linux/linux.i386.conf index 3c79db5f52..3226bf775e 100644 --- a/projects/Intel/linux/linux.i386.conf +++ b/projects/Intel/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/i386 2.6.39-rc5 Kernel Configuration +# Linux/i386 2.6.39-rc5-git2 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -943,7 +943,7 @@ CONFIG_MII=y CONFIG_NETDEV_1000=y # CONFIG_ACENIC is not set # CONFIG_DL2K is not set -# CONFIG_E1000 is not set +CONFIG_E1000=m CONFIG_E1000E=m # CONFIG_IP1000 is not set # CONFIG_IGB is not set @@ -2505,7 +2505,6 @@ CONFIG_LOCKD_V4=y CONFIG_NFS_COMMON=y CONFIG_SUNRPC=y CONFIG_SUNRPC_GSS=y -CONFIG_RPCSEC_GSS_KRB5=y # CONFIG_CEPH_FS is not set CONFIG_CIFS=y CONFIG_CIFS_STATS=y diff --git a/projects/Intel/linux/linux.x86_64.conf b/projects/Intel/linux/linux.x86_64.conf index 0c9e780fee..f29e8f4941 100644 --- a/projects/Intel/linux/linux.x86_64.conf +++ b/projects/Intel/linux/linux.x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/x86_64 2.6.39-rc5 Kernel Configuration +# Linux/x86_64 2.6.39-rc5-git2 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -893,7 +893,7 @@ CONFIG_MII=y CONFIG_NETDEV_1000=y # CONFIG_ACENIC is not set # CONFIG_DL2K is not set -# CONFIG_E1000 is not set +CONFIG_E1000=m CONFIG_E1000E=m # CONFIG_IP1000 is not set # CONFIG_IGB is not set @@ -2444,7 +2444,6 @@ CONFIG_LOCKD_V4=y CONFIG_NFS_COMMON=y CONFIG_SUNRPC=y CONFIG_SUNRPC_GSS=y -CONFIG_RPCSEC_GSS_KRB5=y # CONFIG_CEPH_FS is not set CONFIG_CIFS=y CONFIG_CIFS_STATS=y