diff options
| author | Olof Johansson <olof@lixom.net> | 2013-02-06 02:01:56 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-02-06 02:01:56 +0100 |
| commit | cf55f672c325f234d96911571a775b2e7d9cf284 (patch) | |
| tree | 9242f9ddb0f556dca7884c60ad81aefbe35ae258 /arch/arm/mach-s3c24xx/irq-s3c2412.c | |
| parent | Merge branch 'next/irq-s3c24xx' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| parent | ARM: S3C24XX: header mach/regs-mem.h local (diff) | |
| download | linux-cf55f672c325f234d96911571a775b2e7d9cf284.tar.xz linux-cf55f672c325f234d96911571a775b2e7d9cf284.zip | |
Merge branch 'next/cleanup-s3c24xx-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup
From Kukjin Kim:
This is 4th cleanup for Samsung S3C24XX stuff, and removes plat-s3c24xx
directory.
* 'next/cleanup-s3c24xx-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: S3C24XX: header mach/regs-mem.h local
ARM: S3C24XX: header mach/regs-power.h local
ARM: S3C24XX: header mach/regs-s3c2412-mem.h local
ARM: S3C24XX: Remove plat-s3c24xx directory in arch/arm/
Diffstat (limited to 'arch/arm/mach-s3c24xx/irq-s3c2412.c')
| -rw-r--r-- | arch/arm/mach-s3c24xx/irq-s3c2412.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c24xx/irq-s3c2412.c b/arch/arm/mach-s3c24xx/irq-s3c2412.c index e65619ddbccc..67d763178d3f 100644 --- a/arch/arm/mach-s3c24xx/irq-s3c2412.c +++ b/arch/arm/mach-s3c24xx/irq-s3c2412.c @@ -33,12 +33,13 @@ #include <mach/regs-irq.h> #include <mach/regs-gpio.h> -#include <mach/regs-power.h> #include <plat/cpu.h> #include <plat/irq.h> #include <plat/pm.h> +#include "s3c2412-power.h" + #define INTMSK(start, end) ((1 << ((end) + 1 - (start))) - 1) #define INTMSK_SUB(start, end) (INTMSK(start, end) << ((start - S3C2410_IRQSUB(0)))) |