3 files changed, 9 insertions, 2 deletions

diff --git a/arch/m68k/include/asm/floppy.h b/arch/m68k/include/asm/floppy.h
index 697d50393dd0..47365b1ccbec 100644
--- a/arch/m68k/include/asm/floppy.h
+++ b/arch/m68k/include/asm/floppy.h
@@ -85,7 +85,7 @@ static int fd_request_irq(void)
 {
         if(MACH_IS_Q40)
                 return request_irq(FLOPPY_IRQ, floppy_hardint,
-                                   IRQF_DISABLED, "floppy", floppy_hardint);
+                                   0, "floppy", floppy_hardint);
         else if(MACH_IS_SUN3X)
                 return sun3xflop_request_irq();
         return -ENXIO;
diff --git a/arch/m68k/include/asm/sun3xflop.h b/arch/m68k/include/asm/sun3xflop.h
index 95231e2f9d64..a02ea3a7bb20 100644
--- a/arch/m68k/include/asm/sun3xflop.h
+++ b/arch/m68k/include/asm/sun3xflop.h
@@ -207,7 +207,7 @@ static int sun3xflop_request_irq(void)
         if(!once) {
                 once = 1;
                 error = request_irq(FLOPPY_IRQ, sun3xflop_hardint,
-                                    IRQF_DISABLED, "floppy", NULL);
+                                    0, "floppy", NULL);
                 return ((error == 0) ? 0 : -1);
         } else return 0;
 }
diff --git a/arch/m68k/include/asm/uaccess.h b/arch/m68k/include/asm/uaccess.h
index 639c731568b0..3fadc4a93d97 100644
--- a/arch/m68k/include/asm/uaccess.h
+++ b/arch/m68k/include/asm/uaccess.h
@@ -3,3 +3,10 @@
 #else
 #include <asm/uaccess_mm.h>
 #endif
+
+#ifdef CONFIG_CPU_HAS_NO_UNALIGNED
+#include <asm-generic/uaccess-unaligned.h>
+#else
+#define __get_user_unaligned(x, ptr)    __get_user((x), (ptr))
+#define __put_user_unaligned(x, ptr)    __put_user((x), (ptr))
+#endif