Re: [PATCH 00/24 for-2.6.25] DM9000 updates for 2.6.25

[Andrew Morton <akpm@linux-foundation.org>]

On Tue, 05 Feb 2008 00:01:59 +0000
Ben Dooks <ben-linux@fluff.org> wrote:

> Subject: [PATCH 00/24 for-2.6.25] DM9000 updates for 2.6.25

Holy cow.

> This patch set is a series of updates for the DM9000
> driver, to tidy-up some of the source, stop the accesses
> to the PHY and EEPROM sitting and spinning with locks
> held, and to add ethtool support.

Jeff, the immediate issue is that the driver doesn't compile on mips.  I
have the below lameo fix for it, but it appears to be wrong.  Or at least
suboptimal.

So if you're unprepared to chew on this lot (and 24 patches two weeks into the
merge window is one hell of a chew) then we do need to get that
regression fixed, at least.



From: Andrew Morton <akpm@linux-foundation.org>

mips:

drivers/net/dm9000.c: In function `dm9000_open':
drivers/net/dm9000.c:627: error: `IRQT_RISING' undeclared (first use in this function)
drivers/net/dm9000.c:627: error: (Each undeclared identifier is reported only once
drivers/net/dm9000.c:627: error: for each function it appears in.)

Cc: Daniel Mack <daniel@caiaq.de>
Cc: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/net/dm9000.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff -puN drivers/net/dm9000.c~drivers-net-dm9000c-vague-probably-wrong-build-fix drivers/net/dm9000.c
--- a/drivers/net/dm9000.c~drivers-net-dm9000c-vague-probably-wrong-build-fix
+++ a/drivers/net/dm9000.c
@@ -113,8 +113,10 @@
 #define writesw	outsw
 #define writesl	outsl
 #define DM9000_IRQ_FLAGS	(IRQF_SHARED | IRQF_TRIGGER_HIGH)
-#else
+#elif defined(ARM)
 #define DM9000_IRQ_FLAGS	(IRQF_SHARED | IRQT_RISING)
+#else
+#define DM9000_IRQ_FLAGS	(IRQF_SHARED)
 #endif
 
 /*
_