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-realview/realview_pba8.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-realview/realview_pba8.c')
| -rw-r--r-- | arch/arm/mach-realview/realview_pba8.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-realview/realview_pba8.c b/arch/arm/mach-realview/realview_pba8.c index 6c37621217bc..929b8dc12e81 100644 --- a/arch/arm/mach-realview/realview_pba8.c +++ b/arch/arm/mach-realview/realview_pba8.c | |||
| @@ -331,8 +331,6 @@ static void __init realview_pba8_init(void) | |||
| 331 | 331 | ||
| 332 | MACHINE_START(REALVIEW_PBA8, "ARM-RealView PB-A8") | 332 | MACHINE_START(REALVIEW_PBA8, "ARM-RealView PB-A8") |
| 333 | /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */ | 333 | /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */ |
| 334 | .phys_io = REALVIEW_PBA8_UART0_BASE & SECTION_MASK, | ||
| 335 | .io_pg_offst = (IO_ADDRESS(REALVIEW_PBA8_UART0_BASE) >> 18) & 0xfffc, | ||
| 336 | .boot_params = PHYS_OFFSET + 0x00000100, | 334 | .boot_params = PHYS_OFFSET + 0x00000100, |
| 337 | .fixup = realview_fixup, | 335 | .fixup = realview_fixup, |
| 338 | .map_io = realview_pba8_map_io, | 336 | .map_io = realview_pba8_map_io, |