Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6

[linux-2.6] / include / linux / dm9000.h

diff --git a/include/linux/dm9000.h b/include/linux/dm9000.h
index a3750462f9e34eca3c673e0da9713ecfa44d647e..c30879cf93bc7f522f25579d3e7fbbc59ae60e00 100644 (file)
--- a/include/linux/dm9000.h
+++ b/include/linux/dm9000.h
@@ -21,11 +21,13 @@
 #define DM9000_PLATF_32BITONLY (0x0004)
 #define DM9000_PLATF_EXT_PHY   (0x0008)
 #define DM9000_PLATF_NO_EEPROM (0x0010)
+#define DM9000_PLATF_SIMPLE_PHY (0x0020)  /* Use NSR to find LinkStatus */
 
 /* platfrom data for platfrom device structure's platfrom_data field */
 
 struct dm9000_plat_data {
        unsigned int    flags;
+       unsigned char   dev_addr[6];
 
        /* allow replacement IO routines */