summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilippe Langlais <philippe.langlais@linaro.org>2011-06-20 10:56:04 +0200
committersaid m bagheri <ebgheri@steludxu2848.(none)>2011-06-22 12:59:15 +0200
commit38d5c76e181430d94c4a609812ed484e5a4d255b (patch)
treeba78d608a16f73632ff300200f6d6945d381af2d
parent040ce2b6fbd52635e4f67c15a3cdddca8a5f6876 (diff)
ux500: config: Align u8500_defconfig with u5500+u8500+u9500 default configs
Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
-rw-r--r--arch/arm/configs/u8500_defconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig
index db2fbd8463f..5ed566e784d 100644
--- a/arch/arm/configs/u8500_defconfig
+++ b/arch/arm/configs/u8500_defconfig
@@ -121,6 +121,7 @@ CONFIG_TUN=y
CONFIG_SMSC_PHY=y
CONFIG_NET_ETHERNET=y
CONFIG_SMSC911X=y
+CONFIG_CAIF_SHM=y
# CONFIG_INPUT_MOUSEDEV is not set
CONFIG_INPUT_EVDEV=y
# CONFIG_KEYBOARD_ATKBD is not set
@@ -150,7 +151,6 @@ CONFIG_SPI=y
# CONFIG_STM_MSP_SPI is not set
CONFIG_SPI_PL022=y
CONFIG_GPIO_SYSFS=y
-CONFIG_GPIO_STMPE=y
CONFIG_GPIO_TC3589X=y
CONFIG_AB8500_GPIO=y
CONFIG_POWER_SUPPLY=y
@@ -216,6 +216,7 @@ CONFIG_LEDS_CLASS=y
CONFIG_LEDS_LM3530=y
CONFIG_LEDS_LP5521=y
CONFIG_LEDS_PWM=y
+CONFIG_LEDS_TRIGGER_TIMER=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_AB=y
CONFIG_RTC_DRV_AB8500=y