xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dt/gic' into highbank/soc

Browse Source 
Conflicts:
	arch/arm/Kconfig
This commit is contained in:
Arnd Bergmann
2011-10-31 14:11:34 +01:00
parent 2b228e8cf3 f37a53cc5d
commit 09fa31a322
559 changed files with 8652 additions and 3078 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-omap2/board-generic.c
View File

@@ -65,7 +65,7 @@ static void __init omap_generic_map_io(void)
/* XXX This machine entry name should be updated */
MACHINE_START(OMAP_GENERIC, "Generic OMAP24xx")
/* Maintainer: Paul Mundt <paul.mundt@nokia.com> */
.boot_params = 0x80000100,
.atag_offset = 0x100,
.reserve = omap_reserve,
.map_io = omap_generic_map_io,
.init_early = omap_generic_init_early,