xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests 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 
Conflicts:
	arch/arm/mach-omap2/board-4430sdp.c
	arch/arm/mach-omap2/board-omap4panda.c
	arch/arm/mach-omap2/include/mach/omap4-common.h
	arch/arm/plat-omap/include/plat/irqs.h

The changes to omap4-common.h were moved to arch/arm/mach-omap2/common.h
and the other trivial conflicts resolved.  The now empty ifdef in irqs.h
was also eliminated.
This commit is contained in:
Russell King
2011-11-21 21:56:56 +00:00
parent 59136ef3c5 11f1c5de7b
commit 2d13ccaa87
419 changed files with 4260 additions and 3790 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-omap2/common.h
View File

@@ -169,8 +169,6 @@ void omap3_intc_resume_idle(void);
extern void __iomem *l2cache_base;
#endif
extern void __iomem *gic_dist_base_addr;
extern void __init gic_init_irq(void);
extern void omap_smc1(u32 fn, u32 arg);