diff options
author | Tony Lindgren <tony@atomide.com> | 2012-02-24 13:34:34 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-02-24 13:34:34 -0500 |
commit | 2e3ee9f45b3c25faa012abc9a62ab7aa515cd617 (patch) | |
tree | 0573cc65c3c8906453d949b5fe7f7499d1a25da1 /arch/arm/mach-omap1/pm.c | |
parent | 63325ff235deeed5a5fc25705e292239115c76cd (diff) |
ARM: OMAP1: Move most of plat/io.h into local iomap.h
There's no need to have these in plat/io.h.
While at it, clean up the includes to group them
like they typically are grouped.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap1/pm.c')
-rw-r--r-- | arch/arm/mach-omap1/pm.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c index 89ea20ca0ccc..c06bb4098ac7 100644 --- a/arch/arm/mach-omap1/pm.c +++ b/arch/arm/mach-omap1/pm.c | |||
@@ -42,14 +42,13 @@ | |||
42 | #include <linux/sysfs.h> | 42 | #include <linux/sysfs.h> |
43 | #include <linux/module.h> | 43 | #include <linux/module.h> |
44 | #include <linux/io.h> | 44 | #include <linux/io.h> |
45 | #include <linux/atomic.h> | ||
45 | 46 | ||
46 | #include <asm/irq.h> | 47 | #include <asm/irq.h> |
47 | #include <linux/atomic.h> | ||
48 | #include <asm/mach/time.h> | 48 | #include <asm/mach/time.h> |
49 | #include <asm/mach/irq.h> | 49 | #include <asm/mach/irq.h> |
50 | 50 | ||
51 | #include <plat/cpu.h> | 51 | #include <plat/cpu.h> |
52 | #include <mach/irqs.h> | ||
53 | #include <plat/clock.h> | 52 | #include <plat/clock.h> |
54 | #include <plat/sram.h> | 53 | #include <plat/sram.h> |
55 | #include <plat/tc.h> | 54 | #include <plat/tc.h> |
@@ -57,6 +56,9 @@ | |||
57 | #include <plat/dma.h> | 56 | #include <plat/dma.h> |
58 | #include <plat/dmtimer.h> | 57 | #include <plat/dmtimer.h> |
59 | 58 | ||
59 | #include <mach/irqs.h> | ||
60 | |||
61 | #include "iomap.h" | ||
60 | #include "pm.h" | 62 | #include "pm.h" |
61 | 63 | ||
62 | static unsigned int arm_sleep_save[ARM_SLEEP_SAVE_SIZE]; | 64 | static unsigned int arm_sleep_save[ARM_SLEEP_SAVE_SIZE]; |