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-mmp/tavorevb.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-mmp/tavorevb.c')
| -rw-r--r-- | arch/arm/mach-mmp/tavorevb.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-mmp/tavorevb.c b/arch/arm/mach-mmp/tavorevb.c index e81db7428215..c296b75c4453 100644 --- a/arch/arm/mach-mmp/tavorevb.c +++ b/arch/arm/mach-mmp/tavorevb.c | |||
| @@ -99,8 +99,6 @@ static void __init tavorevb_init(void) | |||
| 99 | } | 99 | } |
| 100 | 100 | ||
| 101 | MACHINE_START(TAVOREVB, "PXA910 Evaluation Board (aka TavorEVB)") | 101 | MACHINE_START(TAVOREVB, "PXA910 Evaluation Board (aka TavorEVB)") |
| 102 | .phys_io = APB_PHYS_BASE, | ||
| 103 | .io_pg_offst = (APB_VIRT_BASE >> 18) & 0xfffc, | ||
| 104 | .map_io = mmp_map_io, | 102 | .map_io = mmp_map_io, |
| 105 | .init_irq = pxa910_init_irq, | 103 | .init_irq = pxa910_init_irq, |
| 106 | .timer = &pxa910_timer, | 104 | .timer = &pxa910_timer, |