diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-24 10:31:34 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-24 10:31:34 +0200 |
| commit | e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30 (patch) | |
| tree | 77926550ac0c31b1423bcf193a4ed0ecb7fda2c1 /arch/arm/mach-s3c2410/pm.c | |
| parent | d4738792fb86600b6cb7220459d9c47e819b3580 (diff) | |
| parent | 72d31053f62c4bc464c2783974926969614a8649 (diff) | |
Merge commit 'v2.6.27-rc7' into x86/microcode
Diffstat (limited to 'arch/arm/mach-s3c2410/pm.c')
| -rw-r--r-- | arch/arm/mach-s3c2410/pm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c2410/pm.c b/arch/arm/mach-s3c2410/pm.c index 3b3a7db4e0d..ba43ff9e816 100644 --- a/arch/arm/mach-s3c2410/pm.c +++ b/arch/arm/mach-s3c2410/pm.c @@ -26,13 +26,13 @@ #include <linux/time.h> #include <linux/sysdev.h> -#include <asm/hardware.h> +#include <mach/hardware.h> #include <asm/io.h> #include <asm/mach-types.h> -#include <asm/arch/regs-gpio.h> -#include <asm/arch/h1940.h> +#include <mach/regs-gpio.h> +#include <mach/h1940.h> #include <asm/plat-s3c24xx/cpu.h> #include <asm/plat-s3c24xx/pm.h> |