diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-18 02:45:02 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-18 02:45:02 +0400 |
| commit | 6e9c6e87a662c6665053fc3cc7840ed6fa80414e (patch) | |
| tree | 2c573ee6bd9e9d77b35ec956e3dfe8aca0ae6fa6 /include/net/ethoc.h | |
| parent | e6bed035ca652c43c897731366ea816ea2c4fbf1 (diff) | |
| parent | 6d0abeca3242a88cab8232e4acd7e2bf088f3bc2 (diff) | |
| download | linux-6e9c6e87a662c6665053fc3cc7840ed6fa80414e.tar.xz | |
Merge 3.14-rc3 into staging-next
We want the fixes in this branch to make testing and future work easier.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/net/ethoc.h')
| -rw-r--r-- | include/net/ethoc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/ethoc.h b/include/net/ethoc.h index 96f3789b27bc..2a2d6bb34eb8 100644 --- a/include/net/ethoc.h +++ b/include/net/ethoc.h @@ -16,6 +16,7 @@ struct ethoc_platform_data { u8 hwaddr[IFHWADDRLEN]; s8 phy_id; + u32 eth_clkfreq; }; #endif /* !LINUX_NET_ETHOC_H */ |