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 'l2x0-pull-rmk' of git://dev.omapzoom.org/pub/scm/santosh/kernel-omap4...
[pandora-kernel.git]
/
arch
/
arm
/
mach-orion5x
/
mv2120-setup.c
diff --git
a/arch/arm/mach-orion5x/mv2120-setup.c
b/arch/arm/mach-orion5x/mv2120-setup.c
index
97c9ccb
..
b3d90f2
100644
(file)
--- a/
arch/arm/mach-orion5x/mv2120-setup.c
+++ b/
arch/arm/mach-orion5x/mv2120-setup.c
@@
-229,8
+229,6
@@
static void __init mv2120_init(void)
/* Warning: HP uses a wrong mach-type (=526) in their bootloader */
MACHINE_START(MV2120, "HP Media Vault mv2120")
/* Maintainer: Martin Michlmayr <tbm@cyrius.com> */
/* Warning: HP uses a wrong mach-type (=526) in their bootloader */
MACHINE_START(MV2120, "HP Media Vault mv2120")
/* Maintainer: Martin Michlmayr <tbm@cyrius.com> */
- .phys_io = ORION5X_REGS_PHYS_BASE,
- .io_pg_offst = ((ORION5X_REGS_VIRT_BASE) >> 18) & 0xFFFC,
.boot_params = 0x00000100,
.init_machine = mv2120_init,
.map_io = orion5x_map_io,
.boot_params = 0x00000100,
.init_machine = mv2120_init,
.map_io = orion5x_map_io,