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 'upstream'
[pandora-kernel.git]
/
arch
/
arm
/
mach-sa1100
/
shannon.c
diff --git
a/arch/arm/mach-sa1100/shannon.c
b/arch/arm/mach-sa1100/shannon.c
index
7482288
..
5aafe0b
100644
(file)
--- a/
arch/arm/mach-sa1100/shannon.c
+++ b/
arch/arm/mach-sa1100/shannon.c
@@
-83,7
+83,6
@@
static void __init shannon_map_io(void)
}
MACHINE_START(SHANNON, "Shannon (AKA: Tuxscreen)")
- .phys_ram = 0xc0000000,
.phys_io = 0x80000000,
.io_pg_offst = ((0xf8000000) >> 18) & 0xfffc,
.boot_params = 0xc0000100,