git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'virtio' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux...
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
board-zoom3.c
diff --git
a/arch/arm/mach-omap2/board-zoom3.c
b/arch/arm/mach-omap2/board-zoom3.c
index
cd3e40c
..
3314704
100644
(file)
--- a/
arch/arm/mach-omap2/board-zoom3.c
+++ b/
arch/arm/mach-omap2/board-zoom3.c
@@
-73,8
+73,8
@@
static void __init omap_zoom_init(void)
}
MACHINE_START(OMAP_ZOOM3, "OMAP Zoom3 board")
}
MACHINE_START(OMAP_ZOOM3, "OMAP Zoom3 board")
- .phys_io =
0x48000000
,
- .io_pg_offst = (
(0xfa000000)
>> 18) & 0xfffc,
+ .phys_io =
ZOOM_UART_BASE
,
+ .io_pg_offst = (
ZOOM_UART_VIRT
>> 18) & 0xfffc,
.boot_params = 0x80000100,
.map_io = omap_zoom_map_io,
.init_irq = omap_zoom_init_irq,
.boot_params = 0x80000100,
.map_io = omap_zoom_map_io,
.init_irq = omap_zoom_init_irq,