diff options
| author | James Morris <jmorris@namei.org> | 2008-08-28 02:47:34 +0200 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-08-28 02:47:34 +0200 |
| commit | 86d688984deefa3ae5a802880c11f2b408b5d6cf (patch) | |
| tree | 7ea5e8189b0a774626d3ed7c3c87df2495a4c4a0 /arch/avr32/mach-at32ap/pm.c | |
| parent | selinux: add support for installing a dummy policy (v2) (diff) | |
| parent | IB/mlx4: Actually return L_Key and R_Key for fast register MRs (diff) | |
| download | linux-86d688984deefa3ae5a802880c11f2b408b5d6cf.tar.xz linux-86d688984deefa3ae5a802880c11f2b408b5d6cf.zip | |
Merge branch 'master' into next
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" |