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 master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable
[pandora-kernel.git]
/
arch
/
arm
/
mach-ux500
/
board-u5500.c
diff --git
a/arch/arm/mach-ux500/board-u5500.c
b/arch/arm/mach-ux500/board-u5500.c
index
4430e69
..
1ca094a
100644
(file)
--- a/
arch/arm/mach-ux500/board-u5500.c
+++ b/
arch/arm/mach-ux500/board-u5500.c
@@
-31,8
+31,6
@@
static void __init u5500_init_machine(void)
}
MACHINE_START(U8500, "ST-Ericsson U5500 Platform")
}
MACHINE_START(U8500, "ST-Ericsson U5500 Platform")
- .phys_io = UX500_UART0_BASE,
- .io_pg_offst = (IO_ADDRESS(UX500_UART0_BASE) >> 18) & 0xfffc,
.boot_params = 0x00000100,
.map_io = u5500_map_io,
.init_irq = ux500_init_irq,
.boot_params = 0x00000100,
.map_io = u5500_map_io,
.init_irq = ux500_init_irq,