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 0008e2ad0c9f78dc6d8b2e969f9d193c8989d06e..fc82446b64255d7fe7c16ba9edb67c2d049b9bf4 100644 (file)
--- a/include/linux/dm9000.h
+++ b/include/linux/dm9000.h
@@ -19,6 +19,9 @@
 #define DM9000_PLATF_8BITONLY  (0x0001)
 #define DM9000_PLATF_16BITONLY (0x0002)
 #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 */