diff options
| author | Olof Johansson <olof@lixom.net> | 2011-12-16 10:02:11 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2011-12-16 10:02:11 +0400 |
| commit | 017c899c2db3da481cc174049e47307ed3aba530 (patch) | |
| tree | d2e55932579421d0196ac63c45bad1de8dbfa5eb /arch/arm/mach-realview/realview_pbx.c | |
| parent | dc47ce90c3a822cd7c9e9339fe4d5f61dcb26b50 (diff) | |
| parent | c97136307c2cd336a3ee68cc0890b0f55d01d2d4 (diff) | |
| download | linux-017c899c2db3da481cc174049e47307ed3aba530.tar.xz | |
Merge branch 'omap/soc' into next/soc
Diffstat (limited to 'arch/arm/mach-realview/realview_pbx.c')
| -rw-r--r-- | arch/arm/mach-realview/realview_pbx.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-realview/realview_pbx.c b/arch/arm/mach-realview/realview_pbx.c index 63c4114afae9..7aabc21af01c 100644 --- a/arch/arm/mach-realview/realview_pbx.c +++ b/arch/arm/mach-realview/realview_pbx.c @@ -98,8 +98,8 @@ static struct map_desc realview_pbx_io_desc[] __initdata = { static struct map_desc realview_local_io_desc[] __initdata = { { - .virtual = IO_ADDRESS(REALVIEW_PBX_TILE_GIC_CPU_BASE), - .pfn = __phys_to_pfn(REALVIEW_PBX_TILE_GIC_CPU_BASE), + .virtual = IO_ADDRESS(REALVIEW_PBX_TILE_SCU_BASE), + .pfn = __phys_to_pfn(REALVIEW_PBX_TILE_SCU_BASE), .length = SZ_4K, .type = MT_DEVICE, }, { @@ -399,6 +399,7 @@ MACHINE_START(REALVIEW_PBX, "ARM-RealView PBX") .init_early = realview_init_early, .init_irq = gic_init_irq, .timer = &realview_pbx_timer, + .handle_irq = gic_handle_irq, .init_machine = realview_pbx_init, #ifdef CONFIG_ZONE_DMA .dma_zone_size = SZ_256M, |