Merge remote-tracking branch 'linus/master' into testing

2 files changed, 2 insertions, 2 deletions

diff --git a/arch/m68k/kernel/asm-offsets.c b/arch/m68k/kernel/asm-offsets.c
index a972b00cd77d..8b7b22846366 100644
--- 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));
diff --git a/arch/m68k/kernel/ints.c b/arch/m68k/kernel/ints.c
index 6b32b64bac35..4d7da384eea0 100644
--- a/arch/m68k/kernel/ints.c
+++ b/arch/m68k/kernel/ints.c
@@ -101,7 +101,7 @@ void __init m68k_setup_user_interrupt(unsigned int vec, unsigned int cnt)
         BUG_ON(IRQ_USER + cnt > NR_IRQS);
         m68k_first_user_vec = vec;
         for (i = 0; i < cnt; i++)
-                irq_set_chip(IRQ_USER + i, &user_irq_chip);
+                irq_set_chip_and_handler(i, &user_irq_chip, handle_simple_irq);
         *user_irqvec_fixup = vec - IRQ_USER;
         flush_icache();
 }