diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-07 04:55:16 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-07 04:55:16 -0400 |
| commit | a1b81a84fff05dbfef45b7012c26e1fee9973e5d (patch) | |
| tree | 3d053e76542ad4d20bd83ad35c13eabff97003ab /arch/avr32/mach-at32ap/pm-at32ap700x.S | |
| parent | 4fb8af10d0fd09372d52966b76922b9e82bbc950 (diff) | |
| parent | 3663b736a5083b3bce74520b637f630f01f66a7f (diff) | |
Merge branch 'header-move' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6
Diffstat (limited to 'arch/avr32/mach-at32ap/pm-at32ap700x.S')
| -rw-r--r-- | arch/avr32/mach-at32ap/pm-at32ap700x.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/avr32/mach-at32ap/pm-at32ap700x.S b/arch/avr32/mach-at32ap/pm-at32ap700x.S index 0a53ad314ff4..5be4de65b209 100644 --- a/arch/avr32/mach-at32ap/pm-at32ap700x.S +++ b/arch/avr32/mach-at32ap/pm-at32ap700x.S | |||
| @@ -10,7 +10,7 @@ | |||
| 10 | #include <asm/asm.h> | 10 | #include <asm/asm.h> |
| 11 | #include <asm/asm-offsets.h> | 11 | #include <asm/asm-offsets.h> |
| 12 | #include <asm/thread_info.h> | 12 | #include <asm/thread_info.h> |
| 13 | #include <asm/arch/pm.h> | 13 | #include <mach/pm.h> |
| 14 | 14 | ||
| 15 | #include "pm.h" | 15 | #include "pm.h" |
| 16 | #include "sdramc.h" | 16 | #include "sdramc.h" |