diff options
| author | Philippe Langlais <philippe.langlais@linaro.org> | 2011-06-20 09:21:26 +0200 |
|---|---|---|
| committer | said m bagheri <ebgheri@steludxu2848.(none)> | 2011-06-22 12:59:14 +0200 |
| commit | 040ce2b6fbd52635e4f67c15a3cdddca8a5f6876 (patch) | |
| tree | 9d0c665e73c88643231aabef1028b86151ac064f /arch/arm/configs/u8500_defconfig | |
| parent | ab2348a54157ef6b9ce15f22e55dd229cbad15aa (diff) | |
ux500: PRCMU: Fix redefinitions to support all Ux500 platforms in same kernel
Minimal changes has been made to ease future merge from Android branch,
a better solution is to set up a PRCMU operations structure.
Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
Diffstat (limited to 'arch/arm/configs/u8500_defconfig')
| -rw-r--r-- | arch/arm/configs/u8500_defconfig | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig index 4fbb7e4d6dc..db2fbd8463f 100644 --- a/arch/arm/configs/u8500_defconfig +++ b/arch/arm/configs/u8500_defconfig @@ -20,11 +20,14 @@ CONFIG_MODULE_SRCVERSION_ALL=y # CONFIG_BLK_DEV_BSG is not set CONFIG_DEFAULT_DEADLINE=y CONFIG_ARCH_U8500=y +CONFIG_UX500_SOC_DB5500=y CONFIG_UX500_SOC_DB8500=y CONFIG_MACH_HREFV60=y CONFIG_MACH_SNOWBALL=y +CONFIG_MACH_U5500=y CONFIG_UX500_PRCMU_TIMER=y CONFIG_DB8500_MLOADER=y +CONFIG_U5500_MLOADER=y CONFIG_UX500_DEBUG_HWREG=y CONFIG_MCDE_DISPLAY_PRIMARY_32BPP=y CONFIG_DISPLAY_GENERIC_DSI_PRIMARY_VSYNC=y @@ -121,6 +124,7 @@ CONFIG_SMSC911X=y # CONFIG_INPUT_MOUSEDEV is not set CONFIG_INPUT_EVDEV=y # CONFIG_KEYBOARD_ATKBD is not set +CONFIG_KEYBOARD_DB5500=y CONFIG_KEYBOARD_GPIO=y CONFIG_KEYBOARD_NOMADIK_SKE=y CONFIG_KEYBOARD_STMPE=y @@ -218,9 +222,10 @@ CONFIG_RTC_DRV_AB8500=y CONFIG_DMADEVICES=y CONFIG_STE_DMA40=y CONFIG_STAGING=y +CONFIG_U5500_MMIO=y CONFIG_U8500_MMIO=y -CONFIG_U8500_CM=y CONFIG_U8500_FLASH=y +CONFIG_U8500_CM=y # CONFIG_STAGING_EXCLUDE_BUILD is not set CONFIG_AUTOFS_FS=m CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=y |