diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2011-10-17 13:15:03 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 11:02:14 +0200 |
| commit | af1fc7acca48a8fe43c15a38a6860f4cf665a369 (patch) | |
| tree | 54791e1a4bb4f8440cdf4ecc9582bdd1172fef55 | |
| parent | f2e756e32aebe5b38962833e2d1db2330454b514 (diff) | |
ARM: mach-ux500: 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
| -rw-r--r-- | arch/arm/mach-ux500/cpu.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/devices-db8500.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-ux500/cpu.c b/arch/arm/mach-ux500/cpu.c index bf8033b44a1..23dd8004933 100644 --- a/arch/arm/mach-ux500/cpu.c +++ b/arch/arm/mach-ux500/cpu.c @@ -19,6 +19,7 @@ #include <linux/of.h> #include <linux/of_irq.h> #include <linux/delay.h> +#include <linux/mfd/dbx500-prcmu.h> #include <asm/hardware/gic.h> #include <asm/mach/map.h> @@ -26,7 +27,6 @@ #include <mach/hardware.h> #include <mach/setup.h> #include <mach/devices.h> -#include <mach/prcmu.h> #include <mach/reboot_reasons.h> #include "clock.h" diff --git a/arch/arm/mach-ux500/devices-db8500.c b/arch/arm/mach-ux500/devices-db8500.c index 7a11b0b24f1..0732bd20de0 100644 --- a/arch/arm/mach-ux500/devices-db8500.c +++ b/arch/arm/mach-ux500/devices-db8500.c @@ -19,7 +19,7 @@ #include <mach/hardware.h> #include <mach/setup.h> #include <video/mcde.h> -#include <mach/prcmu-fw-api.h> +#include <linux/mfd/dbx500-prcmu.h> #include <mach/ste-dma40-db8500.h> #include "pm/pm.h" |