diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-09 09:44:28 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-09 09:44:28 -0800 |
| commit | 2fd592e45b9c89d69e126f172d0f991e2af955e5 (patch) | |
| tree | bacc34dbffb5da09b40840f409f7fad462e0acac /arch/arm/mach-pxa/sharpsl_pm.c | |
| parent | 2affc857efdf7dacace234b63d289d67260c95a6 (diff) | |
| parent | 0a9b0db19262dbb09f3a34195e68cafd5dc3fa10 (diff) | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-apm
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-apm:
[APM] SH: Convert to use shared APM emulation.
[APM] MIPS: Convert to use shared APM emulation.
[APM] ARM: Convert to use shared APM emulation.
[APM] Add shared version of APM emulation
Diffstat (limited to 'arch/arm/mach-pxa/sharpsl_pm.c')
| -rw-r--r-- | arch/arm/mach-pxa/sharpsl_pm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/sharpsl_pm.c b/arch/arm/mach-pxa/sharpsl_pm.c index db6e8f56a75..b1d8cfca245 100644 --- a/arch/arm/mach-pxa/sharpsl_pm.c +++ b/arch/arm/mach-pxa/sharpsl_pm.c @@ -23,7 +23,7 @@ #include <asm/hardware.h> #include <asm/mach-types.h> -#include <asm/apm.h> +#include <asm/apm-emulation.h> #include <asm/arch/pm.h> #include <asm/arch/pxa-regs.h> #include <asm/arch/sharpsl.h> |