summaryrefslogtreecommitdiffstats
path: root/config-x86-32-generic
diff options
context:
space:
mode:
Diffstat (limited to 'config-x86-32-generic')
-rw-r--r--config-x86-32-generic7
1 files changed, 2 insertions, 5 deletions
diff --git a/config-x86-32-generic b/config-x86-32-generic
index 1c75224..b1a0499 100644
--- a/config-x86-32-generic
+++ b/config-x86-32-generic
@@ -89,9 +89,6 @@ CONFIG_X86_LONGRUN=y
CONFIG_X86_HT=y
CONFIG_X86_TRAMPOLINE=y
-# Turn back on in 3.4
-# CONFIG_RELOCATABLE is not set
-
# CONFIG_4KSTACKS is not set
@@ -141,6 +138,8 @@ CONFIG_XEN_MAX_DOMAIN_MEMORY=8
CONFIG_MTD_NAND_CAFE=m
+CONFIG_LBDAF=y
+
# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
@@ -156,8 +155,6 @@ CONFIG_OLPC_XO1_SCI=y
# staging
# CONFIG_FB_OLPC_DCON is not set
-# CONFIG_IRQ_DOMAIN_DEBUG is not set
-
# CONFIG_SPARSE_IRQ is not set
CONFIG_RCU_FANOUT=32