Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6-omap-h63xx.git] / drivers / net / dm9000.h

diff --git a/drivers/net/dm9000.h b/drivers/net/dm9000.h
index 82cad360bafcef12ce0f0f015ba98104652f6a04..ba25cf541420a98ba311953d5c3442209bde720e 100644 (file)
--- a/drivers/net/dm9000.h
+++ b/drivers/net/dm9000.h
@@ -45,6 +45,9 @@
 #define DM9000_CHIPR           0x2C
 #define DM9000_SMCR            0x2F
 
+#define CHIPR_DM9000A         0x19
+#define CHIPR_DM9000B         0x1B
+
 #define DM9000_MRCMDX          0xF0
 #define DM9000_MRCMD           0xF2
 #define DM9000_MRRL            0xF4
@@ -131,5 +134,13 @@
 #define DM9000_PKT_RDY         0x01    /* Packet ready to receive */
 #define DM9000_PKT_MAX         1536    /* Received packet max size */
 
+/* DM9000A / DM9000B definitions */
+
+#define IMR_LNKCHNG            (1<<5)
+#define IMR_UNDERRUN           (1<<4)
+
+#define ISR_LNKCHNG            (1<<5)
+#define ISR_UNDERRUN           (1<<4)
+
 #endif /* _DM9000X_H_ */