diff options
author | Olof Johansson <olof@lixom.net> | 2012-09-21 22:53:48 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-09-21 22:54:15 -0700 |
commit | b536661bb0091b19123fa0c22f7087fd886d7b37 (patch) | |
tree | e83c4ff9bbfe94155cbc7b25fb3b62b814e79ad7 /arch/arm/mach-omap2/omap-wakeupgen.c | |
parent | 20804abdbcfced47b460e5794a685d48225ac754 (diff) | |
parent | fb997a46626dca2778fa7570bb516d8486f2f837 (diff) | |
download | linux-b536661bb0091b19123fa0c22f7087fd886d7b37.tar.bz2 |
Merge branch 'v3.7-samsung-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/fixes-non-critical
A few non-critical fixes/cleanups for samsung platforms.
* 'v3.7-samsung-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: SAMSUNG: Add missing variable declaration in s3c64xx_spi1_set_platdata()
ARM: S3C24XX: removes unnecessary semicolon
ARM: S3C24xx: delete double assignment
ARM: EXYNOS: fix address for EXYNOS4 MDMA1
ARM: EXYNOS: fixed SYSMMU setup definition to mate parameter name
+ sync to 3.6-rc6
Diffstat (limited to 'arch/arm/mach-omap2/omap-wakeupgen.c')
-rw-r--r-- | arch/arm/mach-omap2/omap-wakeupgen.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/omap-wakeupgen.c b/arch/arm/mach-omap2/omap-wakeupgen.c index 567f672ca37e..c4bee21f4210 100644 --- a/arch/arm/mach-omap2/omap-wakeupgen.c +++ b/arch/arm/mach-omap2/omap-wakeupgen.c @@ -46,7 +46,7 @@ static void __iomem *wakeupgen_base; static void __iomem *sar_base; static DEFINE_SPINLOCK(wakeupgen_lock); -static unsigned int irq_target_cpu[NR_IRQS]; +static unsigned int irq_target_cpu[MAX_IRQS]; static unsigned int irq_banks = MAX_NR_REG_BANKS; static unsigned int max_irqs = MAX_IRQS; static unsigned int omap_secure_apis; |