diff options
| author | Olof Johansson <olof@lixom.net> | 2012-12-12 19:09:22 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-12-12 19:10:00 -0500 |
| commit | 4a76411ea3f1da9032e031f8fff8894b97d141b2 (patch) | |
| tree | 59976175d70b6e08aacd4abf7090919d3b78fc29 /arch/arm/mach-omap2/pmu.c | |
| parent | 5c1af2a7011bf719807de360cb64c2f610269a38 (diff) | |
| parent | fb6842a7bc44bf719bfe85d5819a153d7c215510 (diff) | |
ARM: arm-soc: Merge branch 'next/clk' into next/pm
Merge together a couple of the smaller pm/clock branches into one.
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-omap2/pmu.c')
| -rw-r--r-- | arch/arm/mach-omap2/pmu.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/pmu.c b/arch/arm/mach-omap2/pmu.c index 2a791766283d..3cf79b54ce61 100644 --- a/arch/arm/mach-omap2/pmu.c +++ b/arch/arm/mach-omap2/pmu.c | |||
| @@ -15,8 +15,9 @@ | |||
| 15 | 15 | ||
| 16 | #include <asm/pmu.h> | 16 | #include <asm/pmu.h> |
| 17 | 17 | ||
| 18 | #include <plat/omap_hwmod.h> | 18 | #include "soc.h" |
| 19 | #include <plat/omap_device.h> | 19 | #include "omap_hwmod.h" |
| 20 | #include "omap_device.h" | ||
| 20 | 21 | ||
| 21 | static char *omap2_pmu_oh_names[] = {"mpu"}; | 22 | static char *omap2_pmu_oh_names[] = {"mpu"}; |
| 22 | static char *omap3_pmu_oh_names[] = {"mpu", "debugss"}; | 23 | static char *omap3_pmu_oh_names[] = {"mpu", "debugss"}; |