Commit 53fadbdd authored by Russell King's avatar Russell King
Browse files

Merge branch 'irqchip-consolidation' of...

Merge branch 'irqchip-consolidation' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into devel-stable
parents 2d13ccaa e1d95eaf
......@@ -209,7 +209,7 @@ void __init exynos4_init_clocks(int xtal)
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;
......
......@@ -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>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment