Merge tag 'upstream-3.15-rc1' of git://git.infradead.org/linux-ubifs

[karo-tx-linux.git] / arch / m68k / kernel / head.S

diff --git a/arch/m68k/kernel/head.S b/arch/m68k/kernel/head.S
index cb9c40e04e7eda43fd0a54a8ed0ebe880c8af41e..3ab329b8852173694bac06c2559841fed73d95ac 100644 (file)
--- a/arch/m68k/kernel/head.S
+++ b/arch/m68k/kernel/head.S
@@ -3308,7 +3308,7 @@ func_start        console_init,%a0-%a4/%d0-%d7
         *      Some of the register usage that follows
         *              a0 = pointer to boot_info
         *              a1 = pointer to screen
-        *              a2 = pointer to Lconsole_globals
+        *              a2 = pointer to console_globals
         *              d3 = pixel width of screen
         *              d4 = pixel height of screen
         *              (d3,d4) ~= (x,y) of a point just below