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 'linux-next' of git://git.infradead.org/ubi-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-orion5x
/
mss2-setup.c
diff --git
a/arch/arm/mach-orion5x/mss2-setup.c
b/arch/arm/mach-orion5x/mss2-setup.c
index
61c086b
..
2f0e16c
100644
(file)
--- a/
arch/arm/mach-orion5x/mss2-setup.c
+++ b/
arch/arm/mach-orion5x/mss2-setup.c
@@
-261,8
+261,6
@@
static void __init mss2_init(void)
MACHINE_START(MSS2, "Maxtor Shared Storage II")
/* Maintainer: Sylver Bruneau <sylver.bruneau@googlemail.com> */
MACHINE_START(MSS2, "Maxtor Shared Storage II")
/* Maintainer: Sylver Bruneau <sylver.bruneau@googlemail.com> */
- .phys_io = ORION5X_REGS_PHYS_BASE,
- .io_pg_offst = ((ORION5X_REGS_VIRT_BASE) >> 18) & 0xFFFC,
.boot_params = 0x00000100,
.init_machine = mss2_init,
.map_io = orion5x_map_io,
.boot_params = 0x00000100,
.init_machine = mss2_init,
.map_io = orion5x_map_io,