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 branches 'upstream/xenfs' and 'upstream/core' of git://git.kernel.org/pub/scm...
[pandora-kernel.git]
/
arch
/
arm
/
mach-sa1100
/
simpad.c
diff --git
a/arch/arm/mach-sa1100/simpad.c
b/arch/arm/mach-sa1100/simpad.c
index
49cfd64
..
27692d0
100644
(file)
--- a/
arch/arm/mach-sa1100/simpad.c
+++ b/
arch/arm/mach-sa1100/simpad.c
@@
-228,8
+228,6
@@
arch_initcall(simpad_init);
MACHINE_START(SIMPAD, "Simpad")
/* Maintainer: Holger Freyther */
- .phys_io = 0x80000000,
- .io_pg_offst = ((0xf8000000) >> 18) & 0xfffc,
.boot_params = 0xc0000100,
.map_io = simpad_map_io,
.init_irq = sa1100_init_irq,