diff --git a/projects/ION/linux/linux.i386.conf b/projects/ION/linux/linux.i386.conf index a68d0bfb5c..8a709c3e4c 100644 --- a/projects/ION/linux/linux.i386.conf +++ b/projects/ION/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 @@ -979,8 +979,8 @@ CONFIG_FORCEDETH=m CONFIG_NETDEV_1000=y # CONFIG_ACENIC is not set # CONFIG_DL2K is not set -# CONFIG_E1000 is not set -# CONFIG_E1000E is not set +CONFIG_E1000=m +CONFIG_E1000E=m # CONFIG_IP1000 is not set # CONFIG_IGB is not set # CONFIG_IGBVF is not set @@ -2508,7 +2508,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/ION/linux/linux.x86_64.conf b/projects/ION/linux/linux.x86_64.conf index 6c65fc82f2..b288c589d9 100644 --- a/projects/ION/linux/linux.x86_64.conf +++ b/projects/ION/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 @@ -928,8 +928,8 @@ CONFIG_FORCEDETH=m CONFIG_NETDEV_1000=y # CONFIG_ACENIC is not set # CONFIG_DL2K is not set -# CONFIG_E1000 is not set -# CONFIG_E1000E is not set +CONFIG_E1000=m +CONFIG_E1000E=m # CONFIG_IP1000 is not set # CONFIG_IGB is not set # CONFIG_IGBVF is not set @@ -2451,7 +2451,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