Merge branches 'sh/memchunk' and 'common/mmcif' into sh-latest

[mv-sheeva.git] / arch / arm / mach-realview / realview_pbx.c

diff --git a/arch/arm/mach-realview/realview_pbx.c b/arch/arm/mach-realview/realview_pbx.c
index 86f28f725a236d88c9d596488a0bf36b6163b3de..02b755b009dbc0c859f0ebf9d98bbf7f6ea96ad9 100644 (file)
--- a/arch/arm/mach-realview/realview_pbx.c
+++ b/arch/arm/mach-realview/realview_pbx.c
@@ -313,11 +313,9 @@ static void __init gic_init_irq(void)
 {
        /* ARM PBX on-board GIC */
        if (core_tile_pbx11mp() || core_tile_pbxa9mp()) {
-               gic_cpu_base_addr = __io_address(REALVIEW_PBX_TILE_GIC_CPU_BASE);
                gic_init(0, 29, __io_address(REALVIEW_PBX_TILE_GIC_DIST_BASE),
                         __io_address(REALVIEW_PBX_TILE_GIC_CPU_BASE));
        } else {
-               gic_cpu_base_addr = __io_address(REALVIEW_PBX_GIC_CPU_BASE);
                gic_init(0, IRQ_PBX_GIC_START,
                         __io_address(REALVIEW_PBX_GIC_DIST_BASE),
                         __io_address(REALVIEW_PBX_GIC_CPU_BASE));