diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-18 21:33:45 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-18 21:33:45 -0400 |
| commit | ce524c8360d60cc6d3f77986bd58c4448d2b1e3a (patch) | |
| tree | 70ab63183f7952e66e4627ff5c655871b8a8c41c /include/linux | |
| parent | 789c56b7f73218141b8004cb4f775eed8c514212 (diff) | |
| parent | f9e29228e6f2058e7b086115ecb7008630ebd832 (diff) | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
eHEA: Fix bonding support
Blackfin ethernet driver: on chip ethernet MAC controller driver
fix wrong argument of tc35815_read_plat_dev_addr()
ARM/ETHER3: Handle multicast frames.
SAA9730: Handle multicast frames.
NI5010: Handle multicast frames.
NS83820: Handle multicast frames.
Fix RGMII-ID handling in gianfar
Fix Vitesse RGMII-ID support
Add phy-connection-type to gianfar nodes
Fix Vitesse 824x PHY interrupt acking
[PATCH] zd1211rw: Add ID for Siemens Gigaset USB Stick 54
[PATCH] zd1211rw: Add ID for Planex GW-US54GXS
[PATCH] Update version ipw2200 stamp to 1.2.2
[PATCH] ipw2200: Fix ipw_isr() comments error on shared IRQ
[PATCH] Fix ipw2200 set wrong power parameter causing firmware error
[PATCH] ipw2100: Fix `iwpriv set_power` error
[PATCH] softmac: Channel is listed twice in scan output
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/fsl_devices.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/fsl_devices.h b/include/linux/fsl_devices.h index 695741b0e420..1831b196c70a 100644 --- a/include/linux/fsl_devices.h +++ b/include/linux/fsl_devices.h | |||
| @@ -53,6 +53,7 @@ struct gianfar_platform_data { | |||
| 53 | u32 bus_id; | 53 | u32 bus_id; |
| 54 | u32 phy_id; | 54 | u32 phy_id; |
| 55 | u8 mac_addr[6]; | 55 | u8 mac_addr[6]; |
| 56 | phy_interface_t interface; | ||
| 56 | }; | 57 | }; |
| 57 | 58 | ||
| 58 | struct gianfar_mdio_data { | 59 | struct gianfar_mdio_data { |