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-omap2/board-zoom3.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-omap2/board-zoom3.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-zoom3.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-zoom3.c b/arch/arm/mach-omap2/board-zoom3.c index 6ca0b8341615..b2bb3ff971ac 100644 --- a/arch/arm/mach-omap2/board-zoom3.c +++ b/arch/arm/mach-omap2/board-zoom3.c | |||
| @@ -123,8 +123,6 @@ static void __init omap_zoom_init(void) | |||
| 123 | } | 123 | } |
| 124 | 124 | ||
| 125 | MACHINE_START(OMAP_ZOOM3, "OMAP Zoom3 board") | 125 | MACHINE_START(OMAP_ZOOM3, "OMAP Zoom3 board") |
| 126 | .phys_io = ZOOM_UART_BASE, | ||
| 127 | .io_pg_offst = (ZOOM_UART_VIRT >> 18) & 0xfffc, | ||
| 128 | .boot_params = 0x80000100, | 126 | .boot_params = 0x80000100, |
| 129 | .map_io = omap3_map_io, | 127 | .map_io = omap3_map_io, |
| 130 | .reserve = omap_reserve, | 128 | .reserve = omap_reserve, |