Merge commit 'v2.6.39-rc3' into for-2.6.39

[pandora-kernel.git] / arch / arm / mach-omap2 / mux.c

diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c
index bb043cb..a4ab1e3 100644 (file)
--- a/arch/arm/mach-omap2/mux.c
+++ b/arch/arm/mach-omap2/mux.c
@@ -518,7 +518,7 @@ static int omap_mux_dbg_board_show(struct seq_file *s, void *unused)
                        seq_printf(s, "/* %s */\n", m->muxnames[mode]);
 
                /*
-                * XXX: Might be revisited to support differences accross
+                * XXX: Might be revisited to support differences across
                 * same OMAP generation.
                 */
                seq_printf(s, "OMAP%d_MUX(%s, ", omap_gen, m0_def);