diff options
| author | Tony Lindgren | 2006-04-02 18:46:25 +0200 |
|---|---|---|
| committer | Russell King | 2006-04-02 18:46:25 +0200 |
| commit | 670c104ae8e7bcc28be0289a16dac2ddfb88b285 (patch) | |
| tree | 1c55f3a466775fd1d3b73ca28947500221e47134 /arch/arm/mach-omap2/sram-fn.S | |
| parent | [ARM] 3429/1: ARM: OMAP: 4/8 Update GPIO (diff) | |
| download | kernel-qcow2-linux-670c104ae8e7bcc28be0289a16dac2ddfb88b285.tar.gz kernel-qcow2-linux-670c104ae8e7bcc28be0289a16dac2ddfb88b285.tar.xz kernel-qcow2-linux-670c104ae8e7bcc28be0289a16dac2ddfb88b285.zip | |
[ARM] 3430/1: ARM: OMAP: 5/8 Update PM
Patch from Tony Lindgren
Update OMAP PM code from linux-omap tree:
- Move PM code from plat-omap to mach-omap1 and mach-omap2
by Tony Lindgren
- Add minimal PM support for omap24xx by Tony Lindgren and
Richard Woodruff
- Misc updates to omap1 PM code by Tuukka Tikkanen et al
- Updates to the SRAM code needed for PM and FB by Imre Deak
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-omap2/sram-fn.S')
| -rw-r--r-- | arch/arm/mach-omap2/sram-fn.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/sram-fn.S b/arch/arm/mach-omap2/sram-fn.S index 2a869e203342..d261e4ff4d9b 100644 --- a/arch/arm/mach-omap2/sram-fn.S +++ b/arch/arm/mach-omap2/sram-fn.S @@ -1,5 +1,5 @@ /* - * linux/arch/arm/mach-omap1/sram.S + * linux/arch/arm/mach-omap2/sram.S * * Omap2 specific functions that need to be run in internal SRAM * @@ -28,7 +28,7 @@ #include <asm/arch/io.h> #include <asm/hardware.h> -#include <asm/arch/prcm.h> +#include "prcm-regs.h" #define TIMER_32KSYNCT_CR_V IO_ADDRESS(OMAP24XX_32KSYNCT_BASE + 0x010) |