kernel: Update to 3.4.6.

[people/ms/ipfire-3.x.git] / kernel / config-generic

diff --git a/kernel/config-generic b/kernel/config-generic
index 201c0b06ed7493d564d0f172ef3e1cafd11d3aa7..202a0a19bfe41853de55e91cd54662210c2e2c15 100644 (file)
--- a/kernel/config-generic
+++ b/kernel/config-generic
@@ -374,7 +374,7 @@ CONFIG_DEFAULT_CUBIC=y
 # CONFIG_DEFAULT_RENO is not set
 CONFIG_DEFAULT_TCP_CONG="cubic"
 CONFIG_TCP_MD5SIG=y
-CONFIG_IPV6=m
+CONFIG_IPV6=y
 CONFIG_IPV6_PRIVACY=y
 CONFIG_IPV6_ROUTER_PREF=y
 CONFIG_IPV6_ROUTE_INFO=y
@@ -413,7 +413,7 @@ CONFIG_NETFILTER_NETLINK=m
 CONFIG_NETFILTER_NETLINK_ACCT=m
 CONFIG_NETFILTER_NETLINK_QUEUE=m
 CONFIG_NETFILTER_NETLINK_LOG=m
-CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CONNTRACK=y
 CONFIG_NF_CONNTRACK_MARK=y
 CONFIG_NF_CONNTRACK_SECMARK=y
 CONFIG_NF_CONNTRACK_ZONES=y
@@ -2306,7 +2306,7 @@ CONFIG_VIDEO_SAA7146=m
 CONFIG_VIDEO_SAA7146_VV=m
 CONFIG_RC_CORE=m
 CONFIG_LIRC=m
-CONFIG_RC_MAP=m
+# CONFIG_RC_MAP is not set
 CONFIG_IR_NEC_DECODER=m
 CONFIG_IR_RC5_DECODER=m
 CONFIG_IR_RC6_DECODER=m