diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-05-23 04:35:33 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-05-23 04:35:33 +0200 |
| commit | 8ace5c4698ec8da53e69095596718d5a936433de (patch) | |
| tree | 1f5959b3ac289e3bde420cc14109be0cc518a75a /drivers/net/atarilance.c | |
| parent | sh: fixup fpu.o compile order (diff) | |
| parent | Merge branch 'viafb-next' of git://github.com/schandinat/linux-2.6 (diff) | |
| download | linux-8ace5c4698ec8da53e69095596718d5a936433de.tar.xz linux-8ace5c4698ec8da53e69095596718d5a936433de.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest
Diffstat (limited to 'drivers/net/atarilance.c')
| -rw-r--r-- | drivers/net/atarilance.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/atarilance.c b/drivers/net/atarilance.c index ce0091eb06f5..1264d781b554 100644 --- a/drivers/net/atarilance.c +++ b/drivers/net/atarilance.c @@ -554,7 +554,7 @@ static unsigned long __init lance_probe1( struct net_device *dev, 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)) { + "PAM,Riebl-ST Ethernet", dev)) { printk( "Lance: request for irq %d failed\n", IRQ_AUTO_5 ); return 0; } |