diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-02-28 23:27:01 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-02-28 23:27:01 +0100 |
| commit | a5bee307ba7befc96a97915d6d45ffbe1e5f9a20 (patch) | |
| tree | 544713c8b4359221df3677fb93a52892c57fbcee /arch/arm/mach-omap1/pm.c | |
| parent | ARM: OMAP: McSPI: Remove unused flag from struct omap2_mcspi_device_config (diff) | |
| parent | ARM: OMAP2+: Limit omap_read/write usage to legacy USB drivers (diff) | |
| download | linux-a5bee307ba7befc96a97915d6d45ffbe1e5f9a20.tar.xz linux-a5bee307ba7befc96a97915d6d45ffbe1e5f9a20.zip | |
Merge branch 'iomap' into cleanup
Diffstat (limited to 'arch/arm/mach-omap1/pm.c')
| -rw-r--r-- | arch/arm/mach-omap1/pm.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c index 0c2c3669d594..306beaca14c5 100644 --- a/arch/arm/mach-omap1/pm.c +++ b/arch/arm/mach-omap1/pm.c @@ -49,7 +49,6 @@ #include <asm/mach/irq.h> #include <plat/cpu.h> -#include <mach/irqs.h> #include <plat/clock.h> #include <plat/sram.h> #include <plat/tc.h> @@ -57,6 +56,9 @@ #include <plat/dma.h> #include <plat/dmtimer.h> +#include <mach/irqs.h> + +#include "iomap.h" #include "pm.h" static unsigned int arm_sleep_save[ARM_SLEEP_SAVE_SIZE]; |