Merge branch 'for-next' into for-linus

[~andy/linux] / arch / arm / mach-u300 / include / mach / debug-macro.S

diff --git a/arch/arm/mach-u300/include/mach/debug-macro.S b/arch/arm/mach-u300/include/mach/debug-macro.S
index ca4a028c26613097811977bf2f2d14be592aee18..92c12420256ffdc518d8a4102198e42365039032 100644 (file)
--- a/arch/arm/mach-u300/include/mach/debug-macro.S
+++ b/arch/arm/mach-u300/include/mach/debug-macro.S
@@ -11,7 +11,7 @@
 #include <mach/hardware.h>
 
        .macro  addruart, rx, tmp
-       /* If we move the adress using MMU, use this. */
+       /* If we move the address using MMU, use this. */
        mrc     p15, 0, \rx, c1, c0
        tst     \rx, #1                 @ MMU enabled?
        ldreq   \rx,      = U300_SLOW_PER_PHYS_BASE @ MMU off, physical address