diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-12 18:43:39 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-12 18:43:39 -0500 |
| commit | 43ecb9a33ba8c93ebbda81d48ca05f0d1bbf9056 (patch) | |
| tree | 28e4c9fa3ac800e2799d48e981a25f1403c4502e /include/linux/phy.h | |
| parent | 58cba4650a7a414eabd2b40cc9d8e45fcdf192d9 (diff) | |
| parent | 9f3f46b5fe83a56d380d4006dd2cd906bc186f91 (diff) | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'include/linux/phy.h')
| -rw-r--r-- | include/linux/phy.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/phy.h b/include/linux/phy.h index 92a9696fdebe..331521a10a2d 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h | |||
| @@ -53,6 +53,9 @@ | |||
| 53 | 53 | ||
| 54 | #define PHY_MAX_ADDR 32 | 54 | #define PHY_MAX_ADDR 32 |
| 55 | 55 | ||
| 56 | /* Used when trying to connect to a specific phy (mii bus id:phy device id) */ | ||
| 57 | #define PHY_ID_FMT "%x:%02x" | ||
| 58 | |||
| 56 | /* The Bus class for PHYs. Devices which provide access to | 59 | /* The Bus class for PHYs. Devices which provide access to |
| 57 | * PHYs should register using this structure */ | 60 | * PHYs should register using this structure */ |
| 58 | struct mii_bus { | 61 | struct mii_bus { |