diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-08-13 13:08:47 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-08-13 13:08:47 +0200 |
commit | a12e61df4fa1cfae7a6b76976fa65a6fcb048e3f (patch) | |
tree | 957c915298b299902aa80afa7c78e94c71b3dc25 /arch/avr32/mach-at32ap/pm.c | |
parent | x86: fix setup code crashes on my old 486 box (diff) | |
parent | Linux 2.6.27-rc3 (diff) | |
download | linux-a12e61df4fa1cfae7a6b76976fa65a6fcb048e3f.tar.xz linux-a12e61df4fa1cfae7a6b76976fa65a6fcb048e3f.zip |
Merge commit 'v2.6.27-rc3' into x86/urgent
Diffstat (limited to 'arch/avr32/mach-at32ap/pm.c')
-rw-r--r-- | arch/avr32/mach-at32ap/pm.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/avr32/mach-at32ap/pm.c b/arch/avr32/mach-at32ap/pm.c index 0b764320135d..f021edfeaab0 100644 --- a/arch/avr32/mach-at32ap/pm.c +++ b/arch/avr32/mach-at32ap/pm.c @@ -14,11 +14,9 @@ #include <asm/cacheflush.h> #include <asm/sysreg.h> -#include <asm/arch/pm.h> -#include <asm/arch/sram.h> - -/* FIXME: This is only valid for AP7000 */ -#define SDRAMC_BASE 0xfff03800 +#include <mach/chip.h> +#include <mach/pm.h> +#include <mach/sram.h> #include "sdramc.h" |