Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus

[sfrench/cifs-2.6.git] / arch / arm / mach-omap2 / dpll3xxx.c

diff --git a/arch/arm/mach-omap2/dpll3xxx.c b/arch/arm/mach-omap2/dpll3xxx.c
index b32ccd954a1bf43766440db8e19b8ebb92343c7c..ed8d330522f18043a0b8ce6be06023a92988e988 100644 (file)
--- a/arch/arm/mach-omap2/dpll3xxx.c
+++ b/arch/arm/mach-omap2/dpll3xxx.c
@@ -463,7 +463,7 @@ int omap3_noncore_dpll_set_rate(struct clk *clk, unsigned long rate)
        }
        if (!ret) {
                /*
-                * Switch the parent clock in the heirarchy, and make sure
+                * Switch the parent clock in the hierarchy, and make sure
                 * that the new parent's usecount is correct.  Note: we
                 * enable the new parent before disabling the old to avoid
                 * any unnecessary hardware disable->enable transitions.