From 10b7e516caa7d692dcdd8710643d1c8e90a2d520 Mon Sep 17 00:00:00 2001 From: Andrey Konovalov Date: Wed, 21 Aug 2013 21:17:19 +0400 Subject: configs: omap2plus.conf: use distribution.conf choices for conflicting options This lets us merging distribution.conf and omap2plus.conf in any order with the same result. Before that distribution.conf must be merged last to have linux-linaro build to complete ok. Signed-off-by: Andrey Konovalov --- linaro/configs/omap2plus.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linaro/configs/omap2plus.conf b/linaro/configs/omap2plus.conf index 7e427ea9edf..a578f0dd598 100644 --- a/linaro/configs/omap2plus.conf +++ b/linaro/configs/omap2plus.conf @@ -25,7 +25,7 @@ CONFIG_CMDLINE="root=/dev/mmcblk0p2 rootwait console=ttyO2,115200" CONFIG_KEXEC=y CONFIG_FPE_NWFPE=y CONFIG_PM_DEBUG=y -# CONFIG_IPV6 is not set +CONFIG_IPV6=y CONFIG_CAN=m CONFIG_CAN_C_CAN=m CONFIG_CAN_C_CAN_PLATFORM=m @@ -50,7 +50,7 @@ CONFIG_MTD_ONENAND_OMAP2=y CONFIG_MTD_UBI=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=16384 +CONFIG_BLK_DEV_RAM_SIZE=65536 CONFIG_SENSORS_TSL2550=m CONFIG_BMP085_I2C=m CONFIG_SENSORS_LIS3_I2C=m -- cgit v1.2.3