Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec...

[pandora-kernel.git] / include / net / ax88796.h

diff --git a/include/net/ax88796.h b/include/net/ax88796.h
index 51329da..b9a3bec 100644 (file)
--- a/include/net/ax88796.h
+++ b/include/net/ax88796.h
@@ -15,14 +15,17 @@
 #define AXFLG_HAS_EEPROM               (1<<0)
 #define AXFLG_MAC_FROMDEV              (1<<1)  /* device already has MAC */
 #define AXFLG_HAS_93CX6                        (1<<2)  /* use eeprom_93cx6 driver */
+#define AXFLG_MAC_FROMPLATFORM         (1<<3)  /* MAC given by platform data */
 
 struct ax_plat_data {
        unsigned int     flags;
-       unsigned char    wordlength;            /* 1 or 2 */
-       unsigned char    dcr_val;               /* default value for DCR */
-       unsigned char    rcr_val;               /* default value for RCR */
-       unsigned char    gpoc_val;              /* default value for GPOC */
-       u32             *reg_offsets;           /* register offsets */
+       unsigned char    wordlength;    /* 1 or 2 */
+       unsigned char    dcr_val;       /* default value for DCR */
+       unsigned char    rcr_val;       /* default value for RCR */
+       unsigned char    gpoc_val;      /* default value for GPOC */
+       u32             *reg_offsets;   /* register offsets */
+       u8              *mac_addr;      /* MAC addr (only used when
+                                          AXFLG_MAC_FROMPLATFORM is used */
 };
 
 #endif /* __NET_AX88796_PLAT_H */