summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorPhilippe Langlais <philippe.langlais@stericsson.com>2011-10-17 13:04:22 +0200
committerPhilippe Langlais <philippe.langlais@stericsson.com>2012-05-22 11:00:54 +0200
commit013df391764044b68cbd26b283f6a7a9be58aee9 (patch)
tree0f0630d0287d255524de28c085aa7047344b0d9a /arch
parentd3990f196e91132d0c64b7feec0f1093d73d0ffb (diff)
ARM: ux500: core: Replace mach prcmu driver with mainlined version
The prcmu driver now exists in drivers/mfd Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32057
Diffstat (limited to 'arch')
-rwxr-xr-xarch/arm/configs/u8500_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig
index 8bef0eee3aa..362fadbb628 100755
--- a/arch/arm/configs/u8500_defconfig
+++ b/arch/arm/configs/u8500_defconfig
@@ -26,7 +26,6 @@ CONFIG_MACH_SNOWBALL=y
CONFIG_MACH_U8500_SNOWBALL=y
CONFIG_MACH_U5500=y
CONFIG_MACH_UX500_DT=y
-CONFIG_U8500_PRCMU=y
CONFIG_U8500_REGULATOR_DEBUG=y
CONFIG_DB8500_MLOADER=y
CONFIG_DISPLAY_GENERIC_PRIMARY=y
@@ -185,6 +184,7 @@ CONFIG_SENSORS_L3G4200D=y
CONFIG_WATCHDOG=y
CONFIG_MFD_STMPE=y
CONFIG_MFD_TC3589X=y
+CONFIG_MFD_DB8500_PRCMU=y
CONFIG_TPS6105X=y
CONFIG_AB5500_CORE=y
CONFIG_AB8500_CORE=y