diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-09 09:09:29 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-09 09:09:29 -0400 |
| commit | 054d5c9238f3c577ad51195c3ee7803613f322cc (patch) | |
| tree | ff7d9f5c0e0ddf14230ba28f28ef69a2c0a0debf /arch/arm/mach-mmp/flint.c | |
| parent | 11e4afb49b7fa1fc8e1ffd850c1806dd86a08204 (diff) | |
| parent | 2192482ee5ce5d5d4a6cec0c351b2d3a744606eb (diff) | |
Merge branch 'devel-stable' into devel
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, |