Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

Pull m68k updates from Geert Uytterhoeven:
 "Summary:

  - switch to asm-generic/futex.h

  - various cleanups

  - defconfig updates"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k/defconfig: Enable Ethernet bridging
  m68k/defconfig: Enable Atari EtherNAT and EtherNEC Ethernet support
  m68k/defconfig: Enable automounting of devtmpfs at /dev
  m68k/defconfig: Enable early printk support
  m68k/defconfig: Enable test modules
  m68k/defconfig: Refresh defconfigs for v3.16-rc1--v3.19-rc2
  m68k/atari: Remove obsolete IRQ_TYPE_*
  sound: dmasound_atari: Remove obsolete IRQ_TYPE_SLOW
  video: atafb: Remove obsolete IRQ_TYPE_PRIO
  parport: parport_atari: Remove obsolete IRQ_TYPE_SLOW
  net: atarilance: Remove obsolete IRQ_TYPE_PRIO
  m68k/atari: Remove obsolete keyboard_tasklet scheduling
  m68k/mac: Fix scsi_type for Mac LC and similar models
  m68k: Switch to asm-generic/futex.h
  m68k/mvme147: config.c - Remove unused functions
  m68k/atari: atakeyb.c - Remove some unused functions
  m68k/mvme16x: rtc - Don't use module_init in non-modular code

3 files changed, 7 insertions, 8 deletions

diff --git a/drivers/net/ethernet/amd/atarilance.c b/drivers/net/ethernet/amd/atarilance.c
index e07ce5ff2d48..b10964e8cb54 100644
--- a/drivers/net/ethernet/amd/atarilance.c
+++ b/drivers/net/ethernet/amd/atarilance.c
@@ -553,8 +553,8 @@ static unsigned long __init lance_probe1( struct net_device *dev,
         if (lp->cardtype == PAM_CARD ||
                 memaddr == (unsigned short *)0xffe00000) {
                 /* PAMs card and Riebl on ST use level 5 autovector */
-                if (request_irq(IRQ_AUTO_5, lance_interrupt, IRQ_TYPE_PRIO,
-                            "PAM,Riebl-ST Ethernet", dev)) {
+                if (request_irq(IRQ_AUTO_5, lance_interrupt, 0,
+                                "PAM,Riebl-ST Ethernet", dev)) {
                         printk( "Lance: request for irq %d failed\n", IRQ_AUTO_5 );
                         return 0;
                 }
@@ -567,8 +567,8 @@ static unsigned long __init lance_probe1( struct net_device *dev,
                         printk( "Lance: request for VME interrupt failed\n" );
                         return 0;
                 }
-                if (request_irq(irq, lance_interrupt, IRQ_TYPE_PRIO,
-                            "Riebl-VME Ethernet", dev)) {
+                if (request_irq(irq, lance_interrupt, 0, "Riebl-VME Ethernet",
+                                dev)) {
                         printk( "Lance: request for irq %u failed\n", irq );
                         return 0;
                 }
diff --git a/drivers/parport/parport_atari.c b/drivers/parport/parport_atari.c
index 7ad59ac68cf6..a81cd2a2747f 100644
--- a/drivers/parport/parport_atari.c
+++ b/drivers/parport/parport_atari.c
@@ -192,8 +192,8 @@ static int __init parport_atari_init(void)
                                           &parport_atari_ops);
                 if (!p)
                         return -ENODEV;
-                if (request_irq(IRQ_MFP_BUSY, parport_irq_handler,
-                                IRQ_TYPE_SLOW, p->name, p)) {
+                if (request_irq(IRQ_MFP_BUSY, parport_irq_handler, 0, p->name,
+                                p)) {
                         parport_put_port (p);
                         return -ENODEV;
                 }
diff --git a/drivers/video/fbdev/atafb.c b/drivers/video/fbdev/atafb.c
index 4953b657635e..cb9ee2556850 100644
--- a/drivers/video/fbdev/atafb.c
+++ b/drivers/video/fbdev/atafb.c
@@ -3118,8 +3118,7 @@ int __init atafb_init(void)
                         printk("atafb_init: initializing Falcon hw\n");
                         fbhw = &falcon_switch;
                         atafb_ops.fb_setcolreg = &falcon_setcolreg;
-                        error = request_irq(IRQ_AUTO_4, falcon_vbl_switcher,
-                                            IRQ_TYPE_PRIO,
+                        error = request_irq(IRQ_AUTO_4, falcon_vbl_switcher, 0,
                                             "framebuffer:modeswitch",
                                             falcon_vbl_switcher);
                         if (error)