diff options
| author | Ingo Molnar <[email protected]> | 2008-08-14 10:55:26 +0200 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2008-08-14 10:55:26 +0200 |
| commit | d4439087d316613548c70472291bf4ca646ce24b (patch) | |
| tree | 4819f39cbbfcc2ed9c9f85c7a91cbf142f5b02d4 /arch/arm/mach-pxa/pm.c | |
| parent | 26d809af6397ce5c37f5c44d89734d19cce1ad25 (diff) | |
| parent | 30a2f3c60a84092c8084dfe788b710f8d0768cd4 (diff) | |
Merge commit 'v2.6.27-rc3' into x86/xsave
Conflicts:
arch/x86/kernel/genapic_64.c
include/asm-x86/kvm_host.h
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'arch/arm/mach-pxa/pm.c')
| -rw-r--r-- | arch/arm/mach-pxa/pm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-pxa/pm.c b/arch/arm/mach-pxa/pm.c index 7d4debbdcca3..1b539e675579 100644 --- a/arch/arm/mach-pxa/pm.c +++ b/arch/arm/mach-pxa/pm.c @@ -16,12 +16,12 @@ #include <linux/errno.h> #include <linux/time.h> -#include <asm/hardware.h> +#include <mach/hardware.h> #include <asm/memory.h> #include <asm/system.h> -#include <asm/arch/pm.h> -#include <asm/arch/pxa-regs.h> -#include <asm/arch/lubbock.h> +#include <mach/pm.h> +#include <mach/pxa-regs.h> +#include <mach/lubbock.h> #include <asm/mach/time.h> struct pxa_cpu_pm_fns *pxa_cpu_pm_fns; |