summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--target/linux/ar71xx/config-3.32
-rw-r--r--target/linux/generic/config-3.62
-rw-r--r--target/linux/generic/config-3.78
-rw-r--r--target/linux/realview/config-3.36
4 files changed, 9 insertions, 9 deletions
diff --git a/target/linux/ar71xx/config-3.3 b/target/linux/ar71xx/config-3.3
index 446f202b3..458307f64 100644
--- a/target/linux/ar71xx/config-3.3
+++ b/target/linux/ar71xx/config-3.3
@@ -40,11 +40,11 @@ CONFIG_ATH79_MACH_EW_DORIN=y
CONFIG_ATH79_MACH_HORNET_UB=y
CONFIG_ATH79_MACH_JA76PF=y
CONFIG_ATH79_MACH_JWAP003=y
+CONFIG_ATH79_MACH_MR600=y
CONFIG_ATH79_MACH_MZK_W04NU=y
CONFIG_ATH79_MACH_MZK_W300NH=y
CONFIG_ATH79_MACH_NBG460N=y
CONFIG_ATH79_MACH_OM2P=y
-CONFIG_ATH79_MACH_MR600=y
CONFIG_ATH79_MACH_PB42=y
CONFIG_ATH79_MACH_PB44=y
CONFIG_ATH79_MACH_PB92=y
diff --git a/target/linux/generic/config-3.6 b/target/linux/generic/config-3.6
index 6f8f6b018..56a5731b1 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 349eb9434..fe7b36dce 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
diff --git a/target/linux/realview/config-3.3 b/target/linux/realview/config-3.3
index 86e573d6e..d9de6150c 100644
--- a/target/linux/realview/config-3.3
+++ b/target/linux/realview/config-3.3
@@ -73,11 +73,11 @@ CONFIG_CPU_USE_DOMAINS=y
CONFIG_CPU_V6=y
CONFIG_CPU_V6K=y
CONFIG_CPU_V7=y
-CONFIG_DEBUG_USER=y
-# CONFIG_DEBUG_LL_UART_NONE is not set
# CONFIG_DEBUG_ICEDCC is not set
-CONFIG_DEBUG_REALVIEW_STD_PORT=y
+# CONFIG_DEBUG_LL_UART_NONE is not set
# CONFIG_DEBUG_REALVIEW_PB1176_PORT is not set
+CONFIG_DEBUG_REALVIEW_STD_PORT=y
+CONFIG_DEBUG_USER=y
CONFIG_DMA_CACHE_RWFO=y
CONFIG_DNOTIFY=y
CONFIG_FB=y