aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-11-20 07:19:06 +0000
committerGabor Juhos <juhosg@openwrt.org>2012-11-20 07:19:06 +0000
commitacda372a7446febaa38a5f51bb82e64049b98fd1 (patch)
tree45fd636cac4032b8fc5788ff0eccd726e68ac526 /target/linux/generic
parent0dd9afae4e81e557ff30d1b41e177631f624bfaa (diff)
downloadupstream-acda372a7446febaa38a5f51bb82e64049b98fd1.tar.gz
upstream-acda372a7446febaa38a5f51bb82e64049b98fd1.tar.bz2
upstream-acda372a7446febaa38a5f51bb82e64049b98fd1.zip
refresh all kernel configurations
Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34267 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic')
-rw-r--r--target/linux/generic/config-3.62
-rw-r--r--target/linux/generic/config-3.78
2 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/generic/config-3.6 b/target/linux/generic/config-3.6
index 6f8f6b018e..56a5731b1b 100644
--- a/target/linux/generic/config-3.6
+++ b/target/linux/generic/config-3.6
@@ -3055,8 +3055,8 @@ CONFIG_TMPFS_XATTR=y
# CONFIG_TOUCHSCREEN_ILI210X is not set
# CONFIG_TOUCHSCREEN_INEXIO is not set
# CONFIG_TOUCHSCREEN_MCS5000 is not set
-# CONFIG_TOUCHSCREEN_MMS114 is not set
# CONFIG_TOUCHSCREEN_MK712 is not set
+# CONFIG_TOUCHSCREEN_MMS114 is not set
# CONFIG_TOUCHSCREEN_MTOUCH is not set
# CONFIG_TOUCHSCREEN_PENMOUNT is not set
# CONFIG_TOUCHSCREEN_S3C2410 is not set
diff --git a/target/linux/generic/config-3.7 b/target/linux/generic/config-3.7
index 349eb94348..fe7b36dce0 100644
--- a/target/linux/generic/config-3.7
+++ b/target/linux/generic/config-3.7
@@ -435,8 +435,8 @@ CONFIG_CONSTRUCTORS=y
# CONFIG_CONTEXT_SWITCH_TRACER is not set
# CONFIG_COPS is not set
# CONFIG_CORDIC is not set
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
# CONFIG_COREDUMP is not set
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
# CONFIG_CPA_DEBUG is not set
# CONFIG_CPU_DCACHE_DISABLE is not set
# CONFIG_CPU_FREQ is not set
@@ -2018,8 +2018,8 @@ CONFIG_NF_CONNTRACK_PROCFS=y
# CONFIG_NF_NAT_AMANDA is not set
# CONFIG_NF_NAT_FTP is not set
# CONFIG_NF_NAT_H323 is not set
-# CONFIG_NF_NAT_IRC is not set
CONFIG_NF_NAT_IPV4=m
+# CONFIG_NF_NAT_IRC is not set
# CONFIG_NF_NAT_NEEDED is not set
# CONFIG_NF_NAT_PPTP is not set
# CONFIG_NF_NAT_PROTO_GRE is not set
@@ -3004,8 +3004,8 @@ CONFIG_STAGING=y
# CONFIG_STAGING_MEDIA is not set
CONFIG_STANDALONE=y
CONFIG_STDBINUTILS=y
-# CONFIG_STE_MODEM_RPROC is not set
# CONFIG_STE10XP is not set
+# CONFIG_STE_MODEM_RPROC is not set
# CONFIG_STMMAC_ETH is not set
CONFIG_STP=y
# CONFIG_STRICT_DEVMEM is not set
@@ -3095,8 +3095,8 @@ CONFIG_TMPFS_XATTR=y
# CONFIG_TOUCHSCREEN_ILI210X is not set
# CONFIG_TOUCHSCREEN_INEXIO is not set
# CONFIG_TOUCHSCREEN_MCS5000 is not set
-# CONFIG_TOUCHSCREEN_MMS114 is not set
# CONFIG_TOUCHSCREEN_MK712 is not set
+# CONFIG_TOUCHSCREEN_MMS114 is not set
# CONFIG_TOUCHSCREEN_MTOUCH is not set
# CONFIG_TOUCHSCREEN_PENMOUNT is not set
# CONFIG_TOUCHSCREEN_S3C2410 is not set