diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-03-06 13:32:47 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-03-06 13:32:47 -0800 |
| commit | 00fd72ccc928c1fefc4c9c3b925f82cb71750dfb (patch) | |
| tree | fb77d8bad2e21597ed5d0b34fdd040044999e2c2 /arch/arm/mach-omap2/omap-smp.c | |
| parent | 9cf793f9b8b1ba9414e2a7591b2e911885f85a27 (diff) | |
| parent | 1416408d31236dc2a80d269aa23ffa93aa01e833 (diff) | |
Merge branch 'for_3.4/cleanup/pm' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into cleanup-pm
Diffstat (limited to 'arch/arm/mach-omap2/omap-smp.c')
| -rw-r--r-- | arch/arm/mach-omap2/omap-smp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/omap-smp.c b/arch/arm/mach-omap2/omap-smp.c index c1bf3ef0ba02..deffbf1c9627 100644 --- a/arch/arm/mach-omap2/omap-smp.c +++ b/arch/arm/mach-omap2/omap-smp.c @@ -23,11 +23,12 @@ #include <asm/cacheflush.h> #include <asm/hardware/gic.h> #include <asm/smp_scu.h> + #include <mach/hardware.h> #include <mach/omap-secure.h> +#include "iomap.h" #include "common.h" - #include "clockdomain.h" /* SCU base address */ |