diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-31 07:50:18 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-31 07:50:18 +0100 |
| commit | 194dcdba5a11a0238aef7ed91f32df77cb31505b (patch) | |
| tree | ad9b2e763d702ab59d176f3acc57dbb200afdad1 /include | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil... (diff) | |
| parent | gianfar: Don't reset TBI<->SerDes link if it's already up (diff) | |
| download | linux-194dcdba5a11a0238aef7ed91f32df77cb31505b.tar.xz linux-194dcdba5a11a0238aef7ed91f32df77cb31505b.zip | |
Merge branch 'davem-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/fsl_devices.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/fsl_devices.h b/include/linux/fsl_devices.h index 4e625e0094c8..708bab58d8d0 100644 --- a/include/linux/fsl_devices.h +++ b/include/linux/fsl_devices.h @@ -49,7 +49,8 @@ struct gianfar_platform_data { u32 device_flags; /* board specific information */ u32 board_flags; - char bus_id[MII_BUS_ID_SIZE]; + int mdio_bus; /* Bus controlled by us */ + char bus_id[MII_BUS_ID_SIZE]; /* Bus PHY is on */ u32 phy_id; u8 mac_addr[6]; phy_interface_t interface; |