diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2010-10-30 07:35:11 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2010-10-30 07:35:11 -0400 |
| commit | 67577927e8d7a1f4b09b4992df640eadc6aacb36 (patch) | |
| tree | 2e9efe6b5745965faf0dcc084d4613d9356263f9 /arch/arm/mach-orion5x/mv2120-setup.c | |
| parent | 6fe4c590313133ebd5dadb769031489ff178ece1 (diff) | |
| parent | 51f00a471ce8f359627dd99aeac322947a0e491b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Conflicts:
drivers/mtd/mtd_blkdevs.c
Merge Grant's device-tree bits so that we can apply the subsequent fixes.
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'arch/arm/mach-orion5x/mv2120-setup.c')
| -rw-r--r-- | arch/arm/mach-orion5x/mv2120-setup.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-orion5x/mv2120-setup.c b/arch/arm/mach-orion5x/mv2120-setup.c index 97c9ccb2ac60..b3d90f25de9f 100644 --- 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) | |||
| 229 | /* Warning: HP uses a wrong mach-type (=526) in their bootloader */ | 229 | /* Warning: HP uses a wrong mach-type (=526) in their bootloader */ |
| 230 | MACHINE_START(MV2120, "HP Media Vault mv2120") | 230 | MACHINE_START(MV2120, "HP Media Vault mv2120") |
| 231 | /* Maintainer: Martin Michlmayr <tbm@cyrius.com> */ | 231 | /* Maintainer: Martin Michlmayr <tbm@cyrius.com> */ |
| 232 | .phys_io = ORION5X_REGS_PHYS_BASE, | ||
| 233 | .io_pg_offst = ((ORION5X_REGS_VIRT_BASE) >> 18) & 0xFFFC, | ||
| 234 | .boot_params = 0x00000100, | 232 | .boot_params = 0x00000100, |
| 235 | .init_machine = mv2120_init, | 233 | .init_machine = mv2120_init, |
| 236 | .map_io = orion5x_map_io, | 234 | .map_io = orion5x_map_io, |