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 commit 'v2.6.35' into kbuild/kbuild
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
board-zoom-debugboard.c
diff --git
a/arch/arm/mach-omap2/board-zoom-debugboard.c
b/arch/arm/mach-omap2/board-zoom-debugboard.c
index
e15d2e8
..
1d7f827
100644
(file)
--- a/
arch/arm/mach-omap2/board-zoom-debugboard.c
+++ b/
arch/arm/mach-omap2/board-zoom-debugboard.c
@@
-82,7
+82,7
@@
static inline void __init zoom_init_smsc911x(void)
static struct plat_serial8250_port serial_platform_data[] = {
{
- .mapbase =
0x10000000
,
+ .mapbase =
ZOOM_UART_BASE
,
.irq = OMAP_GPIO_IRQ(102),
.flags = UPF_BOOT_AUTOCONF|UPF_IOREMAP|UPF_SHARE_IRQ,
.irqflags = IRQF_SHARED | IRQF_TRIGGER_RISING,