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

[linux-2.6-omap-h63xx.git] / include / linux / smsc911x.h

diff --git a/include/linux/smsc911x.h b/include/linux/smsc911x.h
index 47c4ffd10dbb1dc8462eb813cff6e8f34da24c53..b32725075d7183a58bbf192fef069f26b8ef2735 100644 (file)
--- a/include/linux/smsc911x.h
+++ b/include/linux/smsc911x.h
@@ -28,6 +28,7 @@
 struct smsc911x_platform_config {
        unsigned int irq_polarity;
        unsigned int irq_type;
+       unsigned int flags;
        phy_interface_t phy_interface;
 };
 
@@ -39,4 +40,11 @@ struct smsc911x_platform_config {
 #define SMSC911X_IRQ_TYPE_OPEN_DRAIN           0
 #define SMSC911X_IRQ_TYPE_PUSH_PULL            1
 
+/* Constants for flags */
+#define SMSC911X_USE_16BIT                     (BIT(0))
+#define SMSC911X_USE_32BIT                     (BIT(1))
+#define SMSC911X_FORCE_INTERNAL_PHY            (BIT(2))
+#define SMSC911X_FORCE_EXTERNAL_PHY            (BIT(3))
+#define SMSC911X_SAVE_MAC_ADDRESS              (BIT(4))
+
 #endif /* __LINUX_SMSC911X_H__ */