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 'for-linus' of git://git.open-osd.org/linux-open-osd
[pandora-kernel.git]
/
arch
/
arm
/
mach-sa1100
/
collie.c
diff --git
a/arch/arm/mach-sa1100/collie.c
b/arch/arm/mach-sa1100/collie.c
index
16e682d
..
d43c5ef
100644
(file)
--- a/
arch/arm/mach-sa1100/collie.c
+++ b/
arch/arm/mach-sa1100/collie.c
@@
-379,8
+379,6
@@
static void __init collie_map_io(void)
}
MACHINE_START(COLLIE, "Sharp-Collie")
- .phys_io = 0x80000000,
- .io_pg_offst = ((0xf8000000) >> 18) & 0xfffc,
.map_io = collie_map_io,
.init_irq = sa1100_init_irq,
.timer = &sa1100_timer,