commit 53fadbdd83039bb1181e4ff76123d612cdf26c37
author Russell King <rmk+kernel@arm.linux.org.uk> Sat Dec 03 09:11:54 2011 +0000
committer Russell King <rmk+kernel@arm.linux.org.uk> Sat Dec 03 09:11:54 2011 +0000
tree 4ea282d4209bcd6db7e67458ae3582c4cb904b9c
parent 2d13ccaa8797d7e599f3792aed4b1e44b47f94a5
parent e1d95eaf005b7edd3e63ba9312994c3f834a78ac

Merge branch 'irqchip-consolidation' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into devel-stable

arch/arm/mach-exynos/cpu.c

diff --git a/arch/arm/mach-exynos/cpu.c b/arch/arm/mach-exynos/cpu.c
index 6e34485..22316cb 100644
--- a/arch/arm/mach-exynos/cpu.c
+++ b/arch/arm/mach-exynos/cpu.c
@@ -209,7 +209,7 @@
 void __init exynos4_init_irq(void)
 {
 	int irq;
-	unsigned int bank_offset;
+	unsigned int gic_bank_offset;
 
 	gic_bank_offset = soc_is_exynos4412() ? 0x4000 : 0x8000;
 

arch/arm/mach-exynos/mach-universal_c210.c

diff --git a/arch/arm/mach-exynos/mach-universal_c210.c b/arch/arm/mach-exynos/mach-universal_c210.c
index 48e85b0..cfc7d50 100644
--- a/arch/arm/mach-exynos/mach-universal_c210.c
+++ b/arch/arm/mach-exynos/mach-universal_c210.c
@@ -21,7 +21,7 @@
 #include <linux/mmc/host.h>
 #include <linux/i2c-gpio.h>
 #include <linux/i2c/mcs.h>
- <linux/i2c/atmel_mxt_ts.h>
+#include <linux/i2c/atmel_mxt_ts.h>
 
 #include <asm/mach/arch.h>
 #include <asm/hardware/gic.h>