diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-03-19 02:38:50 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-03-19 02:38:50 -0400 |
| commit | 97eb3f24352ec6632c2127b35d8087d2a809a9b9 (patch) | |
| tree | 722948059bbd325bbca232269490124231df80d4 /include/linux/bfin_mac.h | |
| parent | 439581ec07fa9cf3f519dd461a2cf41cfd3adcb4 (diff) | |
| parent | def179c271ac9b5020deca798470521f14d11edd (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'include/linux/bfin_mac.h')
| -rw-r--r-- | include/linux/bfin_mac.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/bfin_mac.h b/include/linux/bfin_mac.h index 904dec7d03a1..a69554ef8476 100644 --- a/include/linux/bfin_mac.h +++ b/include/linux/bfin_mac.h | |||
| @@ -24,6 +24,7 @@ struct bfin_mii_bus_platform_data { | |||
| 24 | const unsigned short *mac_peripherals; | 24 | const unsigned short *mac_peripherals; |
| 25 | int phy_mode; | 25 | int phy_mode; |
| 26 | unsigned int phy_mask; | 26 | unsigned int phy_mask; |
| 27 | unsigned short vlan1_mask, vlan2_mask; | ||
| 27 | }; | 28 | }; |
| 28 | 29 | ||
| 29 | #endif | 30 | #endif |