diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-14 17:24:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-14 17:24:51 -0400 |
| commit | 7e69a8c4d06b7ecb874f571e82b715a9f79bc3c4 (patch) | |
| tree | 0248fb8f7a3e445cc3c744252abeecabb9205c05 /arch/arm/plat-s3c24xx/irq.c | |
| parent | b6825d2df55aa7d7341c715b577b73a6a03dc944 (diff) | |
| parent | d5120ae72a066b18f98e0c45ce73262f58030851 (diff) | |
Merge branch 's3c-move' into devel
Conflicts:
arch/arm/mach-versatile/core.c
Diffstat (limited to 'arch/arm/plat-s3c24xx/irq.c')
| -rw-r--r-- | arch/arm/plat-s3c24xx/irq.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/plat-s3c24xx/irq.c b/arch/arm/plat-s3c24xx/irq.c index 590fc5a3ab06..963f7a4f26f2 100644 --- a/arch/arm/plat-s3c24xx/irq.c +++ b/arch/arm/plat-s3c24xx/irq.c | |||
| @@ -65,9 +65,9 @@ | |||
| 65 | #include <mach/regs-irq.h> | 65 | #include <mach/regs-irq.h> |
| 66 | #include <mach/regs-gpio.h> | 66 | #include <mach/regs-gpio.h> |
| 67 | 67 | ||
| 68 | #include <asm/plat-s3c24xx/cpu.h> | 68 | #include <plat/cpu.h> |
| 69 | #include <asm/plat-s3c24xx/pm.h> | 69 | #include <plat/pm.h> |
| 70 | #include <asm/plat-s3c24xx/irq.h> | 70 | #include <plat/irq.h> |
| 71 | 71 | ||
| 72 | /* wakeup irq control */ | 72 | /* wakeup irq control */ |
| 73 | 73 | ||