diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-13 19:59:15 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-13 19:59:15 -0400 |
| commit | 7d72e6fa56c4100b9669efe0044f77ed9eb785a1 (patch) | |
| tree | 5e90bf4969809a1ab20b97432b85be20ccfaa1f4 /arch/arm/mach-mmp/flint.c | |
| parent | ba00376b0b13f234d839541a7b36a5bf5c2a4036 (diff) | |
| parent | 2be1f3a73dd02e38e181cf5abacb3d45a6a2d6b8 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'arch/arm/mach-mmp/flint.c')
| -rw-r--r-- | arch/arm/mach-mmp/flint.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-mmp/flint.c b/arch/arm/mach-mmp/flint.c index 4ec7709a3462..e4312d238eae 100644 --- a/arch/arm/mach-mmp/flint.c +++ b/arch/arm/mach-mmp/flint.c | |||
| @@ -114,9 +114,8 @@ static void __init flint_init(void) | |||
| 114 | 114 | ||
| 115 | MACHINE_START(FLINT, "Flint Development Platform") | 115 | MACHINE_START(FLINT, "Flint Development Platform") |
| 116 | .phys_io = APB_PHYS_BASE, | 116 | .phys_io = APB_PHYS_BASE, |
| 117 | .boot_params = 0x00000100, | ||
| 118 | .io_pg_offst = (APB_VIRT_BASE >> 18) & 0xfffc, | 117 | .io_pg_offst = (APB_VIRT_BASE >> 18) & 0xfffc, |
| 119 | .map_io = pxa_map_io, | 118 | .map_io = mmp_map_io, |
| 120 | .init_irq = mmp2_init_irq, | 119 | .init_irq = mmp2_init_irq, |
| 121 | .timer = &mmp2_timer, | 120 | .timer = &mmp2_timer, |
| 122 | .init_machine = flint_init, | 121 | .init_machine = flint_init, |