kernel: update 3.10 to 3.10.36

[openwrt/openwrt.git] / target / linux / ixp4xx / config-3.10

diff --git a/target/linux/ixp4xx/config-3.10 b/target/linux/ixp4xx/config-3.10
index 89cc7476c6d91ad6bfd6d9758715a7bfabedab51..3e3fdce50c848213363fc9e137b158819bf44788 100644 (file)
--- a/target/linux/ixp4xx/config-3.10
+++ b/target/linux/ixp4xx/config-3.10
@@ -1,5 +1,4 @@
 CONFIG_ALIGNMENT_TRAP=y
-# CONFIG_ALX is not set
 # CONFIG_ARCH_ADI_COYOTE is not set
 CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y
 CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
@@ -180,7 +179,6 @@ CONFIG_MTD_REDBOOT_PARTS=y
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NEED_MACH_IO_H=y
 CONFIG_NEED_PER_CPU_KM=y
-# CONFIG_NET_IP_TUNNEL is not set
 CONFIG_NET_VENDOR_XSCALE=y
 CONFIG_OLD_SIGACTION=y
 CONFIG_OLD_SIGSUSPEND3=y