commit 931f57378631c19545ec933d2df0f4fb46d16659
author Linus Walleij <linus.walleij@linaro.org> Tue May 28 16:40:29 2013 +0200
committer Linus Walleij <linus.walleij@linaro.org> Sat Jul 20 11:59:44 2013 +0200
tree d31b0d2729cb9ce38fda4df792ef8bdc172ead63
parent 9af588736f48401cca6a39a96a59fb994068237f

ARM: nomadik: update defconfig base

Update the Nomadik defconfig enabling:
- GPIO keyboard input
- Regulators
- LED class driver
- LED heartbeat trigger

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

arch/arm/configs/nhk8815_defconfig

diff --git a/arch/arm/configs/nhk8815_defconfig b/arch/arm/configs/nhk8815_defconfig
index b605575..e4cb5a4 100644
--- a/arch/arm/configs/nhk8815_defconfig
+++ b/arch/arm/configs/nhk8815_defconfig
@@ -48,7 +48,6 @@
 CONFIG_MTD=y
 CONFIG_MTD_TESTS=m
 CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_CHAR=y
 CONFIG_MTD_BLOCK=y
 CONFIG_MTD_NAND_ECC_SMC=y
 CONFIG_MTD_NAND=y
@@ -94,6 +93,7 @@
 CONFIG_I2C_NOMADIK=y
 CONFIG_DEBUG_GPIO=y
 # CONFIG_HWMON is not set
+CONFIG_REGULATOR=y
 CONFIG_MMC=y
 CONFIG_MMC_UNSAFE_RESUME=y
 # CONFIG_MMC_BLOCK_BOUNCE is not set