summaryrefslogtreecommitdiffstats
path: root/config-x86-32-generic
diff options
context:
space:
mode:
authorAnton Arapov <anton@redhat.com>2012-10-29 11:15:37 +0100
committerAnton Arapov <anton@redhat.com>2012-10-29 11:15:37 +0100
commit7d558cd9c7b18e4b16953265aa0da45e63f3b968 (patch)
tree7135d5a810768c9c619346282ee9cfdf1765e225 /config-x86-32-generic
parent985ef6b2108ed28ffd5f6630e1e0fce2e2a775f2 (diff)
downloadkernel-uprobes-7d558cd9c7b18e4b16953265aa0da45e63f3b968.tar.gz
kernel-uprobes-7d558cd9c7b18e4b16953265aa0da45e63f3b968.tar.xz
kernel-uprobes-7d558cd9c7b18e4b16953265aa0da45e63f3b968.zip
fedora kernel: cd394142aac30b5c751f25b517572e2448695641v3.6.3-2f17
Signed-off-by: Anton Arapov <anton@redhat.com>
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 1c75224623f..b1a04993a5d 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