summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Konovalov <andrey.konovalov@linaro.org>2013-05-28 22:36:29 +0400
committerAndrey Konovalov <andrey.konovalov@linaro.org>2013-05-28 22:36:29 +0400
commit964a2e9470c1291a91ecdb1703a69d05b9bf9eef (patch)
tree97bf2288d27622b9ae95f12000eb70758147020f
parent2df7837a224311f330c99179c0fc21185d04bc85 (diff)
parent1610b665ae7d7642462e6390d4ef945f3c754e80 (diff)
Merge branch 'tracking-boards-configs' into merge-linux-linaroll-20130528.0
-rw-r--r--linaro/configs/omap4.conf3
1 files changed, 3 insertions, 0 deletions
diff --git a/linaro/configs/omap4.conf b/linaro/configs/omap4.conf
index 7599f80f928..ccfe722ee84 100644
--- a/linaro/configs/omap4.conf
+++ b/linaro/configs/omap4.conf
@@ -85,6 +85,8 @@ CONFIG_SERIAL_8250_DETECT_IRQ=y
CONFIG_SERIAL_8250_RSA=y
CONFIG_SERIAL_AMBA_PL011=y
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
+CONFIG_SERIAL_OMAP=y
+CONFIG_SERIAL_OMAP_CONSOLE=y
CONFIG_HW_RANDOM=y
CONFIG_I2C_CHARDEV=y
CONFIG_SPI=y
@@ -162,6 +164,7 @@ CONFIG_MMC_ARMMMCI=y
CONFIG_MMC_OMAP=y
CONFIG_MMC_OMAP_HS=y
CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
CONFIG_LEDS_GPIO=y
CONFIG_LEDS_TRIGGERS=y
CONFIG_LEDS_TRIGGER_TIMER=y