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

Merge branch 'depends/rmk/memory_h' into next/fixes

Browse Source 
Fix up all conflicts between the memory.h cleanup and bug fixes.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
2011-10-31 23:11:46 +01:00
parent 43872fa788 0cdc8b921d
commit 5725aeae5f
465 changed files with 825 additions and 1664 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-pxa/zeus.c
View File

@@ -904,7 +904,7 @@ static void __init zeus_map_io(void)
MACHINE_START(ARCOM_ZEUS, "Arcom/Eurotech ZEUS")
/* Maintainer: Marc Zyngier <maz@misterjones.org> */
.boot_params = 0xa0000100,
.atag_offset = 0x100,
.map_io = zeus_map_io,
.nr_irqs = ZEUS_NR_IRQS,
.init_irq = zeus_init_irq,