kernel: Add ATM fixes pending upstream merge (queue reduction, race fixes)

[openwrt.git] / target / linux / realview / config-3.3

diff --git a/target/linux/realview/config-3.3 b/target/linux/realview/config-3.3
index 86e573d..7c43565 100644 (file)
--- a/target/linux/realview/config-3.3
+++ b/target/linux/realview/config-3.3
@@ -36,7 +36,6 @@ CONFIG_ARM_THUMB=y
 CONFIG_ARM_TIMER_SP804=y
 CONFIG_ATAGS_PROC=y
 CONFIG_AUTO_ZRELADDR=y
-CONFIG_BCMA_POSSIBLE=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=4096
@@ -73,11 +72,10 @@ 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_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
@@ -234,6 +232,5 @@ CONFIG_VECTORS_BASE=0xffff0000
 CONFIG_VFP=y
 CONFIG_VFPv3=y
 CONFIG_XPS=y
-CONFIG_XZ_DEC=y
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_ZBOOT_ROM_TEXT=0x0