From 3f67f99775f2e992bf6f2ffd3a4cb582092c6b73 Mon Sep 17 00:00:00 2001 From: Ben Dooks Date: Tue, 24 Jun 2008 22:16:07 +0100 Subject: [PATCH] --- yaml --- r: 103106 b: refs/heads/master c: 6ff4ff06d2b6e4cfd4767ef03675cd3c7c70eaa0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/dm9000.c | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index ada5a5b5e2ed..fd518edf98b2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 485ca22a10b3d3a4d156e170a541b8c3a5144f8c +refs/heads/master: 6ff4ff06d2b6e4cfd4767ef03675cd3c7c70eaa0 diff --git a/trunk/drivers/net/dm9000.c b/trunk/drivers/net/dm9000.c index 92233400e6f9..952e10d686ec 100644 --- a/trunk/drivers/net/dm9000.c +++ b/trunk/drivers/net/dm9000.c @@ -54,9 +54,6 @@ #define writesb outsb #define writesw outsw #define writesl outsl -#define DEFAULT_TRIGGER IRQF_TRIGGER_HIGH -#else -#define DEFAULT_TRIGGER (0) #endif /* @@ -1014,11 +1011,9 @@ dm9000_open(struct net_device *dev) /* If there is no IRQ type specified, default to something that * may work, and tell the user that this is a problem */ - if (irqflags == IRQF_TRIGGER_NONE) { + if (irqflags == IRQF_TRIGGER_NONE) dev_warn(db->dev, "WARNING: no IRQ resource flags set.\n"); - irqflags = DEFAULT_TRIGGER; - } - + irqflags |= IRQF_SHARED; if (request_irq(dev->irq, &dm9000_interrupt, irqflags, dev->name, dev))