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_pba8.c | |
| parent | 1dca899e95d27475c9036ce1cf857a72852b9c53 (diff) | |
| parent | 648f15345add88a7eea724365fe1217a8d8a1e16 (diff) | |
Merge branch 'sh/stable-updates'
Diffstat (limited to 'arch/arm/mach-realview/realview_pba8.c')
| -rw-r--r-- | arch/arm/mach-realview/realview_pba8.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-realview/realview_pba8.c b/arch/arm/mach-realview/realview_pba8.c index 941beb2b9709..fe861e96c566 100644 --- a/arch/arm/mach-realview/realview_pba8.c +++ b/arch/arm/mach-realview/realview_pba8.c | |||
| @@ -298,6 +298,7 @@ MACHINE_START(REALVIEW_PBA8, "ARM-RealView PB-A8") | |||
| 298 | .phys_io = REALVIEW_PBA8_UART0_BASE, | 298 | .phys_io = REALVIEW_PBA8_UART0_BASE, |
| 299 | .io_pg_offst = (IO_ADDRESS(REALVIEW_PBA8_UART0_BASE) >> 18) & 0xfffc, | 299 | .io_pg_offst = (IO_ADDRESS(REALVIEW_PBA8_UART0_BASE) >> 18) & 0xfffc, |
| 300 | .boot_params = PHYS_OFFSET + 0x00000100, | 300 | .boot_params = PHYS_OFFSET + 0x00000100, |
| 301 | .fixup = realview_fixup, | ||
| 301 | .map_io = realview_pba8_map_io, | 302 | .map_io = realview_pba8_map_io, |
| 302 | .init_irq = gic_init_irq, | 303 | .init_irq = gic_init_irq, |
| 303 | .timer = &realview_pba8_timer, | 304 | .timer = &realview_pba8_timer, |