diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-08-12 11:28:00 +0100 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-08-12 11:28:00 +0100 |
| commit | 742c52533b05d8ae83c794bd6811100675b85ce5 (patch) | |
| tree | de89a81d88c19504d1dc4f023a4b480c9022b3b5 /arch/avr32/mach-at32ap/pm-at32ap700x.S | |
| parent | 36cd4fb5d277f34fe9e4db0deac2d4efd7dff735 (diff) | |
| parent | 10fec20ef5eec1c91913baec1225400f0d02df40 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-arm/arch-omap/onenand.h
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 0a53ad314ff..5be4de65b20 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" |