summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2016-01-23 14:43:30 -0800
committerRobin H. Johnson <robbat2@gentoo.org>2016-01-23 14:43:41 -0800
commitedca92475c35d93185ca48f8956e290370acad2b (patch)
tree8a210d1d0a7a02c081388e88f75c618fef2ba1df
parentkconfig/x86*: CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is hazardous to have by default. (diff)
downloadgenkernel-edca92475c35d93185ca48f8956e290370acad2b.tar.gz
genkernel-edca92475c35d93185ca48f8956e290370acad2b.tar.bz2
genkernel-edca92475c35d93185ca48f8956e290370acad2b.zip
kconfig/generic: Remove dupe option CONFIG_NET_IPGRE_DEMUX.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-rw-r--r--defaults/kernel-generic-config1
1 files changed, 0 insertions, 1 deletions
diff --git a/defaults/kernel-generic-config b/defaults/kernel-generic-config
index a088fc39..d608c1dc 100644
--- a/defaults/kernel-generic-config
+++ b/defaults/kernel-generic-config
@@ -4443,7 +4443,6 @@ CONFIG_DLCI_COUNT=24
CONFIG_DLCI_MAX=8
CONFIG_ANON_ZERO_PAGE=y
CONFIG_TREE_RCU=y
-CONFIG_NET_IPGRE_DEMUX=y
CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
CONFIG_BRIDGE_IGMP_SNOOPING=y
CONFIG_NETFILTER_XT_TARGET_AUDIT=m