diff options
| author |   Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-07 09:55:16 +0100 |
|---|---|---|
| committer |   Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-07 09:55:16 +0100 |
| commit | a1b81a84fff05dbfef45b7012c26e1fee9973e5d (patch) | |
| tree | 3d053e76542ad4d20bd83ad35c13eabff97003ab /arch/avr32/mach-at32ap/pm-at32ap700x.S | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes (diff) | |
| parent | avr32: Use <mach/foo.h> instead of <asm/arch/foo.h> (diff) | |
| download | linux-dev-a1b81a84fff05dbfef45b7012c26e1fee9973e5d.tar.xz linux-dev-a1b81a84fff05dbfef45b7012c26e1fee9973e5d.zip | |
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 @@ #include <asm/asm.h> #include <asm/asm-offsets.h> #include <asm/thread_info.h> -#include <asm/arch/pm.h> +#include <mach/pm.h> #include "pm.h" #include "sdramc.h" |