diff options
author | Ingo Molnar | 2013-04-19 13:03:08 +0200 |
---|---|---|
committer | Ingo Molnar | 2013-04-19 13:03:08 +0200 |
commit | 5379f8c0d72cab43bbe6d974ceb3ad84dddc2b8e (patch) | |
tree | 524d8ac34cc8c7ef68b43e3ee6e08e27db86299c /arch/arm/mach-s3c24xx/include/mach/irqs.h | |
parent | Merge tag 'please-pull-cmci_rediscover' of git://git.kernel.org/pub/scm/linux... (diff) | |
parent | amd64_edac: Add Family 16h support (diff) | |
download | kernel-qcow2-linux-5379f8c0d72cab43bbe6d974ceb3ad84dddc2b8e.tar.gz kernel-qcow2-linux-5379f8c0d72cab43bbe6d974ceb3ad84dddc2b8e.tar.xz kernel-qcow2-linux-5379f8c0d72cab43bbe6d974ceb3ad84dddc2b8e.zip |
Merge tag 'edac_amd_f16h' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras into x86/ras
Pull AMD F16h support for amd64_edac from Borislav Petkov.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/mach-s3c24xx/include/mach/irqs.h')
-rw-r--r-- | arch/arm/mach-s3c24xx/include/mach/irqs.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c24xx/include/mach/irqs.h b/arch/arm/mach-s3c24xx/include/mach/irqs.h index b7a9f4d469e8..1e73f5fa8659 100644 --- a/arch/arm/mach-s3c24xx/include/mach/irqs.h +++ b/arch/arm/mach-s3c24xx/include/mach/irqs.h @@ -188,10 +188,8 @@ #if defined(CONFIG_CPU_S3C2416) #define NR_IRQS (IRQ_S3C2416_I2S1 + 1) -#elif defined(CONFIG_CPU_S3C2443) -#define NR_IRQS (IRQ_S3C2443_AC97+1) #else -#define NR_IRQS (IRQ_S3C2440_AC97+1) +#define NR_IRQS (IRQ_S3C2443_AC97 + 1) #endif /* compatibility define. */ |