diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-11-17 20:53:52 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-11-17 20:53:52 -0500 |
| commit | 260af56271f79da0e37faa5a99b1786b221297e5 (patch) | |
| tree | d76a2609f940b88083314d5f9131c73115bd4dcb /arch/arm/mach-realview/realview_pb11mp.c | |
| parent | 1dca899e95d27475c9036ce1cf857a72852b9c53 (diff) | |
| parent | 648f15345add88a7eea724365fe1217a8d8a1e16 (diff) | |
Merge branch 'sh/stable-updates'
Diffstat (limited to 'arch/arm/mach-realview/realview_pb11mp.c')
| -rw-r--r-- | arch/arm/mach-realview/realview_pb11mp.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-realview/realview_pb11mp.c b/arch/arm/mach-realview/realview_pb11mp.c index 070d284ce96e..9bbbfc05f225 100644 --- a/arch/arm/mach-realview/realview_pb11mp.c +++ b/arch/arm/mach-realview/realview_pb11mp.c | |||
| @@ -347,6 +347,7 @@ MACHINE_START(REALVIEW_PB11MP, "ARM-RealView PB11MPCore") | |||
| 347 | .phys_io = REALVIEW_PB11MP_UART0_BASE, | 347 | .phys_io = REALVIEW_PB11MP_UART0_BASE, |
| 348 | .io_pg_offst = (IO_ADDRESS(REALVIEW_PB11MP_UART0_BASE) >> 18) & 0xfffc, | 348 | .io_pg_offst = (IO_ADDRESS(REALVIEW_PB11MP_UART0_BASE) >> 18) & 0xfffc, |
| 349 | .boot_params = PHYS_OFFSET + 0x00000100, | 349 | .boot_params = PHYS_OFFSET + 0x00000100, |
| 350 | .fixup = realview_fixup, | ||
| 350 | .map_io = realview_pb11mp_map_io, | 351 | .map_io = realview_pb11mp_map_io, |
| 351 | .init_irq = gic_init_irq, | 352 | .init_irq = gic_init_irq, |
| 352 | .timer = &realview_pb11mp_timer, | 353 | .timer = &realview_pb11mp_timer, |