Merge branch 'next' into for-linus

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

diff --git a/arch/arm/mach-omap2/omap_phy_internal.c b/arch/arm/mach-omap2/omap_phy_internal.c
index e2e605fe91386c652840285bd2c6cbcd1244dedf..05f6abc96b0d6032edfb3e2b21f85bc90099ba5d 100644 (file)
--- a/arch/arm/mach-omap2/omap_phy_internal.c
+++ b/arch/arm/mach-omap2/omap_phy_internal.c
@@ -112,12 +112,12 @@ int omap4430_phy_power(struct device *dev, int ID, int on)
                else
                        /*
                         * Enable VBUS Valid, AValid and IDDIG
-                        * high impedence
+                        * high impedance
                         */
                        __raw_writel(IDDIG | AVALID | VBUSVALID,
                                                ctrl_base + USBOTGHS_CONTROL);
        } else {
-               /* Enable session END and IDIG to high impedence. */
+               /* Enable session END and IDIG to high impedance. */
                __raw_writel(SESSEND | IDDIG, ctrl_base +
                                        USBOTGHS_CONTROL);
        }