diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-04-19 12:17:34 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-04-19 12:17:34 -0400 |
| commit | cf816ecb533ab96b883dfdc0db174598b5b5c4d2 (patch) | |
| tree | 1b7705db288ae2917105e624b01fdf81e0882bf1 /include/linux/fsl_devices.h | |
| parent | adf6d34e460387ee3e8f1e1875d52bff51212c7d (diff) | |
| parent | 15f7d677ccff6f0f5de8a1ee43a792567e9f9de9 (diff) | |
Merge branch 'merge-fixes' into devel
Diffstat (limited to 'include/linux/fsl_devices.h')
| -rw-r--r-- | include/linux/fsl_devices.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/fsl_devices.h b/include/linux/fsl_devices.h index 1831b196c70a..2cad5c67397e 100644 --- a/include/linux/fsl_devices.h +++ b/include/linux/fsl_devices.h | |||
| @@ -50,7 +50,7 @@ struct gianfar_platform_data { | |||
| 50 | u32 device_flags; | 50 | u32 device_flags; |
| 51 | /* board specific information */ | 51 | /* board specific information */ |
| 52 | u32 board_flags; | 52 | u32 board_flags; |
| 53 | u32 bus_id; | 53 | char bus_id[MII_BUS_ID_SIZE]; |
| 54 | u32 phy_id; | 54 | u32 phy_id; |
| 55 | u8 mac_addr[6]; | 55 | u8 mac_addr[6]; |
| 56 | phy_interface_t interface; | 56 | phy_interface_t interface; |