Merge branch 'torvalds/master'

[firefly-linux-kernel-4.4.55.git] / arch / m68k / kernel / asm-offsets.c

diff --git a/arch/m68k/kernel/asm-offsets.c b/arch/m68k/kernel/asm-offsets.c
index a972b00cd77d7e699ae0c0fcb5f053bfac19f78c..3a386341aa6e282336a5ceea41b248fc45943191 100644 (file)
--- a/arch/m68k/kernel/asm-offsets.c
+++ b/arch/m68k/kernel/asm-offsets.c
@@ -77,7 +77,7 @@ int main(void)
        DEFINE(BIR_SIZE, offsetof(struct bi_record, size));
        DEFINE(BIR_DATA, offsetof(struct bi_record, data));
 
-       /* offsets into font_desc (drivers/video/console/font.h) */
+       /* offsets into the font_desc struct */
        DEFINE(FONT_DESC_IDX, offsetof(struct font_desc, idx));
        DEFINE(FONT_DESC_NAME, offsetof(struct font_desc, name));
        DEFINE(FONT_DESC_WIDTH, offsetof(struct font_desc, width));
@@ -98,6 +98,9 @@ int main(void)
        DEFINE(CIABBASE, &ciab);
        DEFINE(C_PRA, offsetof(struct CIA, pra));
        DEFINE(ZTWOBASE, zTwoBase);
+
+       /* enum m68k_fixup_type */
+       DEFINE(M68K_FIXUP_MEMOFFSET, m68k_fixup_memoffset);
 #endif
 
        return 0;