The following commit has been merged in the linux branch: commit 62e20a624b18e135870ae781087bc63fdda829ba Author: Ben Dooks ben@simtec.co.uk Date: Sat Oct 24 06:53:07 2009 -0700

DM9000: Fix revision ID for DM9000B

The DM9000B revision ID is 0x1A, not 0x1B as set in the curernt dm9000.h header.

Fix bug reported by Paolo Zebelloni.

Signed-off-by: Ben Dooks ben@simtec.co.uk Signed-off-by: Simtec Linux Team linux@simtec.co.uk Signed-off-by: David S. Miller davem@davemloft.net

diff --git a/drivers/net/dm9000.h b/drivers/net/dm9000.h index 80817c2..fb1c924 100644 --- a/drivers/net/dm9000.h +++ b/drivers/net/dm9000.h @@ -50,7 +50,7 @@ #define DM9000_RCSR 0x32

#define CHIPR_DM9000A 0x19 -#define CHIPR_DM9000B 0x1B +#define CHIPR_DM9000B 0x1A

#define DM9000_MRCMDX 0xF0 #define DM9000_MRCMD 0xF2