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 branch 'master' of /usr/src/ntfs-2.6/
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-omap1
/
board-innovator.c
diff --git
a/arch/arm/mach-omap1/board-innovator.c
b/arch/arm/mach-omap1/board-innovator.c
index 95f1ff36cdcbc0b3e81ee5a2f7f298bcf35c7d05..652f37c7f9063addf813f4a6d8eb50a2142aeb29 100644
(file)
--- a/
arch/arm/mach-omap1/board-innovator.c
+++ b/
arch/arm/mach-omap1/board-innovator.c
@@
-303,7
+303,6
@@
static void __init innovator_map_io(void)
MACHINE_START(OMAP_INNOVATOR, "TI-Innovator")
/* Maintainer: MontaVista Software, Inc. */
- .phys_ram = 0x10000000,
.phys_io = 0xfff00000,
.io_pg_offst = ((0xfef00000) >> 18) & 0xfffc,
.boot_params = 0x10000100,