diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-08-15 16:16:15 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-08-15 16:16:15 +0200 |
commit | 1a10390708d675ebf1a2f5e169a5165626afbd88 (patch) | |
tree | d9ee7d10abd65e580fb74152a501089f51174225 /arch/arm/mach-s3c2440/irq.c | |
parent | 239bd83104ec6bcba90221d8b0973d2565142ef8 (diff) | |
parent | b635acec48bcaa9183fcbf4e3955616b0d4119b5 (diff) | |
download | talos-op-linux-1a10390708d675ebf1a2f5e169a5165626afbd88.tar.gz talos-op-linux-1a10390708d675ebf1a2f5e169a5165626afbd88.zip |
Merge branch 'linus' into x86/cpu
Diffstat (limited to 'arch/arm/mach-s3c2440/irq.c')
-rw-r--r-- | arch/arm/mach-s3c2440/irq.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c2440/irq.c b/arch/arm/mach-s3c2440/irq.c index a87608bc1a03..276b823f4e27 100644 --- a/arch/arm/mach-s3c2440/irq.c +++ b/arch/arm/mach-s3c2440/irq.c @@ -25,14 +25,14 @@ #include <linux/ioport.h> #include <linux/sysdev.h> -#include <asm/hardware.h> +#include <mach/hardware.h> #include <asm/irq.h> #include <asm/io.h> #include <asm/mach/irq.h> -#include <asm/arch/regs-irq.h> -#include <asm/arch/regs-gpio.h> +#include <mach/regs-irq.h> +#include <mach/regs-gpio.h> #include <asm/plat-s3c24xx/cpu.h> #include <asm/plat-s3c24xx/pm.h> |