projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-omap1
/
board-osk.c
diff --git
a/arch/arm/mach-omap1/board-osk.c
b/arch/arm/mach-omap1/board-osk.c
index bf1ebe5b244213ac8557b8e2ad8d60d4c6894b9c..e4dca1deebb4585b075f7afbf3b5f90cab829efe 100644
(file)
--- a/
arch/arm/mach-omap1/board-osk.c
+++ b/
arch/arm/mach-omap1/board-osk.c
@@
-582,7
+582,7
@@
static void __init osk_map_io(void)
MACHINE_START(OMAP_OSK, "TI-OSK")
/* Maintainer: Dirk Behme <dirk.behme@de.bosch.com> */
- .
boot_params = 0x10000
100,
+ .
atag_offset = 0x
100,
.map_io = osk_map_io,
.reserve = omap_reserve,
.init_irq = osk_init_irq,