aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilippe Langlais <philippe.langlais@linaro.org>2011-06-27 11:43:55 +0200
committersaid m bagheri <ebgheri@steludxu2848.(none)>2011-06-29 10:30:38 +0200
commit9e6916386fa3a0afb35a56237e8164b598e6a926 (patch)
treea75885ab5ac4f5965bbba876adea28c6ee46905d
parent1107fe2e37a499cd1c85b82d91786daf0dc090cd (diff)
downloadlinux-2.6.38-lt-ux500-9e6916386fa3a0afb35a56237e8164b598e6a926.tar.gz
ux500: config: Align u8500_defconfig with u5500+u8500 default configs
Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
-rw-r--r--arch/arm/configs/u8500_defconfig11
1 files changed, 5 insertions, 6 deletions
diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig
index 64295e2..9f1c14c 100644
--- a/arch/arm/configs/u8500_defconfig
+++ b/arch/arm/configs/u8500_defconfig
@@ -38,8 +38,6 @@ CONFIG_UX500_SUSPEND_STANDBY=y
CONFIG_UX500_SUSPEND_MEM=y
CONFIG_UX500_SUSPEND_DBG=y
CONFIG_UX500_SUSPEND_DBG_WAKE_ON_UART=y
-CONFIG_MODEM=y
-CONFIG_MODEM_U8500=y
CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y
CONFIG_SMP=y
@@ -108,9 +106,8 @@ CONFIG_MISC_DEVICES=y
CONFIG_AB8500_PWM=y
CONFIG_SENSORS_BH1780=y
CONFIG_STE_TRACE_MODEM=y
+CONFIG_U8500_SIM_DETECT=y
CONFIG_STM_TRACE=y
-CONFIG_U8500_SHRM=y
-CONFIG_U8500_SHRM_MODEM_SILENT_RESET=y
# CONFIG_STE_AUDIO_IO_DEV is not set
CONFIG_SCSI=y
CONFIG_BLK_DEV_SD=y
@@ -165,8 +162,6 @@ CONFIG_SENSORS_DB8500=y
CONFIG_SENSORS_LSM303DLH=y
CONFIG_SENSORS_L3G4200D=y
CONFIG_WATCHDOG=y
-CONFIG_UX500_WATCHDOG=y
-CONFIG_UX500_WATCHDOG_DEBUG=y
CONFIG_MFD_STMPE=y
CONFIG_MFD_TC3589X=y
CONFIG_AB5500_CORE=y
@@ -246,6 +241,10 @@ CONFIG_BT_CG2900=y
CONFIG_CW1200=m
CONFIG_CW1200_NON_POWER_OF_TWO_BLOCKSIZES=y
CONFIG_CW1200_USE_GPIO_IRQ=y
+CONFIG_MODEM=y
+CONFIG_MODEM_U8500=y
+CONFIG_U8500_SHRM=y
+CONFIG_U8500_SHRM_MODEM_SILENT_RESET=y
CONFIG_EXT2_FS=y
CONFIG_EXT2_FS_XATTR=y
CONFIG_EXT2_FS_POSIX_ACL=y