diff options
| author | Linus Torvalds | 2015-02-10 13:27:24 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2015-02-10 13:27:24 -0800 |
| commit | ab0475df5ce45d80a9e5f056cbad3a58e4930206 (patch) | |
| tree | 053912870c86d7bbec54f107215c8c7bbb04806a /drivers/net | |
| parent | 3e8c04eb117445d67ae2b83e08bec4005129356a (diff) | |
| parent | 4436820a98cdaf497a874323095e328831030956 (diff) | |
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
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/amd/atarilance.c | 8 |
1 files changed, 4 insertions, 4 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; } |