summaryrefslogtreecommitdiffstats
path: root/drivers/net/sun3lance.c
diff options
context:
space:
mode:
authorSam Ravnborg <sam@mars.ravnborg.org>2006-07-03 23:24:23 +0200
committerSam Ravnborg <sam@mars.ravnborg.org>2006-07-03 23:24:23 +0200
commit05668381140309088443bf5dc53add4104610fbb (patch)
treeed53039717390e1a71ff16209281b1f1c8d3e6be /drivers/net/sun3lance.c
parentkbuild: explicit turn off gcc stack-protector (diff)
parent[PATCH] genirq: Fixup ARM devel merge (diff)
downloadlinux-05668381140309088443bf5dc53add4104610fbb.tar.xz
linux-05668381140309088443bf5dc53add4104610fbb.zip
Merge branch 'master' of /home/sam/kernel/linux-2.6/
Diffstat (limited to 'drivers/net/sun3lance.c')
-rw-r--r--drivers/net/sun3lance.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sun3lance.c b/drivers/net/sun3lance.c
index a2fad50437e6..2dcadb169a22 100644
--- a/drivers/net/sun3lance.c
+++ b/drivers/net/sun3lance.c
@@ -341,7 +341,7 @@ static int __init lance_probe( struct net_device *dev)
REGA(CSR0) = CSR0_STOP;
- request_irq(LANCE_IRQ, lance_interrupt, SA_INTERRUPT, "SUN3 Lance", dev);
+ request_irq(LANCE_IRQ, lance_interrupt, IRQF_DISABLED, "SUN3 Lance", dev);
dev->irq = (unsigned short)LANCE_IRQ;