diff options
author | Philippe Langlais <philippe.langlais@linaro.org> | 2011-06-20 10:56:04 +0200 |
---|---|---|
committer | Robert Marklund <robert.marklund@stericsson.com> | 2011-10-05 12:17:11 +0200 |
commit | e17abcf6e23be8ade262927b0dfb90b3c500ec25 (patch) | |
tree | 20f24f4a00500e43e57bd9ba404fc4cf7e35dee3 | |
parent | 628e49bac6dd179d6602829b96ba181196aa6806 (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_defconfig | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig index 8c59b5badbe..58def8fac72 100644 --- a/arch/arm/configs/u8500_defconfig +++ b/arch/arm/configs/u8500_defconfig @@ -117,9 +117,7 @@ CONFIG_TUN=y CONFIG_SMSC_PHY=y CONFIG_NET_ETHERNET=y CONFIG_SMSC911X=y -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set -# CONFIG_WLAN is not set +CONFIG_CAIF_SHM=y # CONFIG_INPUT_MOUSEDEV is not set CONFIG_INPUT_EVDEV=y # CONFIG_KEYBOARD_ATKBD is not set @@ -148,7 +146,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 +213,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 |