Merge commit 'v2.6.39-rc6' into x86/cleanups

[pandora-kernel.git] / arch / arm / mach-msm / acpuclock-arm11.c

diff --git a/arch/arm/mach-msm/acpuclock-arm11.c b/arch/arm/mach-msm/acpuclock-arm11.c
index 7ffbd98..805d4ee 100644 (file)
--- a/arch/arm/mach-msm/acpuclock-arm11.c
+++ b/arch/arm/mach-msm/acpuclock-arm11.c
@@ -343,7 +343,7 @@ int acpuclk_set_rate(unsigned long rate, int for_power_collapse)
                }
        }
 
-       /* Set wait states for CPU inbetween frequency changes */
+       /* Set wait states for CPU between frequency changes */
        reg_clkctl = readl(A11S_CLK_CNTL_ADDR);
        reg_clkctl |= (100 << 16); /* set WT_ST_CNT */
        writel(reg_clkctl, A11S_CLK_CNTL_ADDR);