aboutsummaryrefslogtreecommitdiff
path: root/debian.linaro/config/config.common.ubuntu
diff options
context:
space:
mode:
Diffstat (limited to 'debian.linaro/config/config.common.ubuntu')
-rw-r--r--debian.linaro/config/config.common.ubuntu5
1 files changed, 2 insertions, 3 deletions
diff --git a/debian.linaro/config/config.common.ubuntu b/debian.linaro/config/config.common.ubuntu
index 88370d297a0d..afd153547c55 100644
--- a/debian.linaro/config/config.common.ubuntu
+++ b/debian.linaro/config/config.common.ubuntu
@@ -375,7 +375,6 @@ CONFIG_DMADEVICES=y
# CONFIG_DMATEST is not set
# CONFIG_DMA_API_DEBUG is not set
CONFIG_DMA_ENGINE=y
-CONFIG_DMA_ZONE_SIZE=96
CONFIG_DM_CRYPT=m
# CONFIG_DM_DEBUG is not set
CONFIG_DM_DELAY=m
@@ -532,6 +531,7 @@ CONFIG_GENERIC_HARDIRQS=y
CONFIG_GENERIC_HWEIGHT=y
CONFIG_GENERIC_IRQ_PROBE=y
# CONFIG_GENERIC_PENDING_IRQ is not set
+# CONFIG_GFS2_FS is not set
CONFIG_GPIOLIB=y
# CONFIG_GPIO_74X164 is not set
# CONFIG_GPIO_ADP5588 is not set
@@ -894,7 +894,7 @@ CONFIG_KSM=y
CONFIG_KTIME_SCALAR=y
# CONFIG_L2TP is not set
# CONFIG_LAPB is not set
-# CONFIG_LBDAF is not set
+CONFIG_LBDAF=y
CONFIG_LCD_CLASS_DEVICE=y
# CONFIG_LCD_L4F00242T03 is not set
# CONFIG_LCD_LMS283GF05 is not set
@@ -1084,7 +1084,6 @@ CONFIG_MXC_PWM=y
CONFIG_MXC_TZIC=y
CONFIG_MXC_VPU=y
# CONFIG_MXC_VPU_DEBUG is not set
-# CONFIG_MXC_VPU_IRAM is not set
CONFIG_MXS_PERFMON=y
CONFIG_NAMESPACES=y
CONFIG_NATIONAL_PHY=y