From cb1446ec54c2af79d15967c8b181bbf73ac47ca0 Mon Sep 17 00:00:00 2001 From: Catalin Marinas Date: Wed, 8 Feb 2006 21:19:39 +0000 Subject: [PATCH] --- yaml --- r: 20130 b: refs/heads/master c: f557f5e51db47887eab170084bbcf9685b48fa06 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-realview/core.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 46499b7f14e8..4d27571fd501 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 365bf8ac6f5b3d3187cb39444fa87a5b38683ff4 +refs/heads/master: f557f5e51db47887eab170084bbcf9685b48fa06 diff --git a/trunk/arch/arm/mach-realview/core.c b/trunk/arch/arm/mach-realview/core.c index 4a222f59f2cf..4303d988c4bf 100644 --- a/trunk/arch/arm/mach-realview/core.c +++ b/trunk/arch/arm/mach-realview/core.c @@ -182,7 +182,7 @@ static const struct icst307_params realview_oscvco_params = { static void realview_oscvco_set(struct clk *clk, struct icst307_vco vco) { void __iomem *sys_lock = __io_address(REALVIEW_SYS_BASE) + REALVIEW_SYS_LOCK_OFFSET; - void __iomem *sys_osc = __io_address(REALVIEW_SYS_BASE) + REALVIEW_SYS_OSC1_OFFSET; + void __iomem *sys_osc = __io_address(REALVIEW_SYS_BASE) + REALVIEW_SYS_OSC4_OFFSET; u32 val; val = readl(sys_osc) & ~0x7ffff;