diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-11 13:40:56 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-11 13:40:56 +0200 |
| commit | 251a169c69d1ff07cee7a9bb9fc4faff6b1d2ac3 (patch) | |
| tree | 3c20c3e080f276848f2ad67aadab44a5d64bfda9 /arch/arm/mach-omap1/pm.c | |
| parent | 6679ce6e5f519096612b480d255d9ca97be0c2be (diff) | |
| parent | 796aadeb1b2db9b5d463946766c5bbfd7717158c (diff) | |
Merge branch 'linus' into sched/urgent
Diffstat (limited to 'arch/arm/mach-omap1/pm.c')
| -rw-r--r-- | arch/arm/mach-omap1/pm.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c index 742f79e73bd..63c4ea18b1c 100644 --- a/arch/arm/mach-omap1/pm.c +++ b/arch/arm/mach-omap1/pm.c @@ -47,17 +47,16 @@ #include <asm/atomic.h> #include <asm/mach/time.h> #include <asm/mach/irq.h> -#include <asm/mach-types.h> - -#include <asm/arch/cpu.h> -#include <asm/arch/irqs.h> -#include <asm/arch/clock.h> -#include <asm/arch/sram.h> -#include <asm/arch/tc.h> -#include <asm/arch/pm.h> -#include <asm/arch/mux.h> -#include <asm/arch/dma.h> -#include <asm/arch/dmtimer.h> + +#include <mach/cpu.h> +#include <mach/irqs.h> +#include <mach/clock.h> +#include <mach/sram.h> +#include <mach/tc.h> +#include <mach/pm.h> +#include <mach/mux.h> +#include <mach/dma.h> +#include <mach/dmtimer.h> static unsigned int arm_sleep_save[ARM_SLEEP_SAVE_SIZE]; static unsigned short dsp_sleep_save[DSP_SLEEP_SAVE_SIZE]; |