diff options
author | Russell King | 2007-02-27 13:10:07 +0100 |
---|---|---|
committer | Russell King | 2007-03-02 12:58:57 +0100 |
commit | 14fca61a9828effbde2c284fbaa3ee22178998e0 (patch) | |
tree | 8f510ec5e76e5d78d25635a713a720c2c3388a01 /arch | |
parent | Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/... (diff) | |
download | kernel-qcow2-linux-14fca61a9828effbde2c284fbaa3ee22178998e0.tar.gz kernel-qcow2-linux-14fca61a9828effbde2c284fbaa3ee22178998e0.tar.xz kernel-qcow2-linux-14fca61a9828effbde2c284fbaa3ee22178998e0.zip |
[ARM] Yet more asm/apm-emulation.h stuff
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-pxa/corgi_pm.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-pxa/spitz_pm.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/corgi_pm.c b/arch/arm/mach-pxa/corgi_pm.c index 165017de8d0d..392c38717362 100644 --- a/arch/arm/mach-pxa/corgi_pm.c +++ b/arch/arm/mach-pxa/corgi_pm.c @@ -16,7 +16,8 @@ #include <linux/delay.h> #include <linux/interrupt.h> #include <linux/platform_device.h> -#include <asm/apm-emulation.h> +#include <linux/apm-emulation.h> + #include <asm/irq.h> #include <asm/mach-types.h> #include <asm/hardware.h> diff --git a/arch/arm/mach-pxa/spitz_pm.c b/arch/arm/mach-pxa/spitz_pm.c index b97d543d9364..745a4dc7acdd 100644 --- a/arch/arm/mach-pxa/spitz_pm.c +++ b/arch/arm/mach-pxa/spitz_pm.c @@ -16,7 +16,8 @@ #include <linux/delay.h> #include <linux/interrupt.h> #include <linux/platform_device.h> -#include <asm/apm-emulation.h> +#include <linux/apm-emulation.h> + #include <asm/irq.h> #include <asm/mach-types.h> #include <asm/hardware.h> |