diff options
| author | Olof Johansson <olof@lixom.net> | 2012-12-13 01:09:22 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-12-13 01:10:00 +0100 |
| commit | 4a76411ea3f1da9032e031f8fff8894b97d141b2 (patch) | |
| tree | 59976175d70b6e08aacd4abf7090919d3b78fc29 /arch/arm/mach-omap2/pm.c | |
| parent | Merge branch 'next/pm-samsung' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| parent | Merge tag 'omap-for-v3.8/clock-signed' of git://git.kernel.org/pub/scm/linux/... (diff) | |
| download | linux-4a76411ea3f1da9032e031f8fff8894b97d141b2.tar.xz linux-4a76411ea3f1da9032e031f8fff8894b97d141b2.zip | |
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/pm.c')
| -rw-r--r-- | arch/arm/mach-omap2/pm.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c index ef668c756db7..f4b3143a8b1d 100644 --- a/arch/arm/mach-omap2/pm.c +++ b/arch/arm/mach-omap2/pm.c @@ -20,10 +20,11 @@ #include <asm/system_misc.h> -#include <plat/omap-pm.h> -#include <plat/omap_device.h> +#include "omap-pm.h" +#include "omap_device.h" #include "common.h" +#include "soc.h" #include "prcm-common.h" #include "voltage.h" #include "powerdomain.h" |