Merge to Fedora kernel-2.6.6-1.422

[linux-2.6.git] / configs / kernel-2.6.6-i686.config

diff --git a/configs/kernel-2.6.6-i686.config b/configs/kernel-2.6.6-i686.config
index f416d4c..b7db2fa 100644 (file)
--- a/configs/kernel-2.6.6-i686.config
+++ b/configs/kernel-2.6.6-i686.config
@@ -22,7 +22,8 @@ CONFIG_SYSVIPC=y
 CONFIG_POSIX_MQUEUE=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_SYSCTL=y
-# CONFIG_AUDIT is not set
+CONFIG_AUDIT=y
+CONFIG_AUDITSYSCALL=y
 CONFIG_LOG_BUF_SHIFT=17
 CONFIG_HOTPLUG=y
 # CONFIG_IKCONFIG is not set
@@ -1101,9 +1102,8 @@ CONFIG_DE600=m
 CONFIG_DE620=m
 
 #
-# Gigabit Ethernet (1000/10000 Mbit)
+# Ethernet (1000 Mbit)
 #
-CONFIG_NET_GIGE=y
 CONFIG_ACENIC=m
 # CONFIG_ACENIC_OMIT_TIGON_I is not set
 CONFIG_DL2K=m
@@ -1115,6 +1115,10 @@ CONFIG_YELLOWFIN=m
 CONFIG_R8169=m
 CONFIG_SK98LIN=m
 CONFIG_TIGON3=m
+
+#
+# Ethernet (10000 Mbit)
+#
 CONFIG_IXGB=m
 CONFIG_IXGB_NAPI=y
 CONFIG_S2IO=m