git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-omap2
/
board-omap3pandora.c
diff --git
a/arch/arm/mach-omap2/board-omap3pandora.c
b/arch/arm/mach-omap2/board-omap3pandora.c
index dd3af2be13be2a79e14a52360088c8cbb9db575b..b7d6df4e3cf95aa3f553a126087ba59353c1c5b3 100644
(file)
--- a/
arch/arm/mach-omap2/board-omap3pandora.c
+++ b/
arch/arm/mach-omap2/board-omap3pandora.c
@@
-717,8
+717,6
@@
static void __init omap3pandora_init(void)
}
MACHINE_START(OMAP3_PANDORA, "Pandora Handheld Console")
- .phys_io = 0x48000000,
- .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc,
.boot_params = 0x80000100,
.map_io = omap3_map_io,
.reserve = omap_reserve,