FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-29 13:00:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Russell King 2011-12-03 09:11:54 +00:00
commit 53fadbdd83
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-exynos/cpu.c
View File

@ -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;

2
arch/arm/mach-exynos/mach-universal_c210.c
View File

@ -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>