Merge branches 'alignment', 'fixes', 'l2c' (early part) and 'misc' into for-next

[pandora-kernel.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 60d322a..535697a 100644 (file)
--- a/arch/arm/mach-realview/realview_pbx.c
+++ b/arch/arm/mach-realview/realview_pbx.c
@@ -367,8 +367,8 @@ static void __init realview_pbx_init(void)
                        __io_address(REALVIEW_PBX_TILE_L220_BASE);
 
                /* set RAM latencies to 1 cycle for eASIC */
-               writel(0, l2x0_base + L2X0_TAG_LATENCY_CTRL);
-               writel(0, l2x0_base + L2X0_DATA_LATENCY_CTRL);
+               writel(0, l2x0_base + L310_TAG_LATENCY_CTRL);
+               writel(0, l2x0_base + L310_DATA_LATENCY_CTRL);
 
                /* 16KB way size, 8-way associativity, parity disabled
                 * Bits:  .. 0 0 0 0 1 00 1 0 1 001 0 000 0 .... .... .... */