diff options
| author | David S. Miller <davem@davemloft.net> | 2013-03-22 18:25:25 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-03-22 18:25:25 +0400 |
| commit | 9b924dbd5e903aa6394ff6feee8275b9bde313d1 (patch) | |
| tree | e61bf96df027d188c5b07722911121ec1186e701 /include | |
| parent | 43d6869037d6fa8f92a7a7e6df3b48147c8a3ef9 (diff) | |
| parent | c3a07134e6aa5b93a37f72ffa3d11fadf72bf757 (diff) | |
| download | linux-9b924dbd5e903aa6394ff6feee8275b9bde313d1.tar.xz | |
Merge branch 'mv643xx_eth'
Florian Fainelli says:
====================
This patch converts the mv643xx_eth driver to use the mvmdio MDIO bus driver
instead of rolling its own implementation. As a result, all users of this
mv643xx_eth driver are converted to register an "orion-mdio" platform_device.
The mvmdio driver is also updated to support an interrupt line which reports
SMI error/completion, and to allow traditionnal platform device registration
instead of just device tree.
David, I think it makes sense for you to merge all of this, since we do
not want the architecture files to be desynchronized from the mv643xx_eth to
avoid runtime breakage. The potential for merge conflicts should be very small.
====================
Tested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-by: Jason Cooper <jason@lakedaemon.net>
Acked-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mv643xx_eth.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/mv643xx_eth.h b/include/linux/mv643xx_eth.h index 49258e0ed1c6..141d395bbb5f 100644 --- a/include/linux/mv643xx_eth.h +++ b/include/linux/mv643xx_eth.h @@ -19,7 +19,6 @@ struct mv643xx_eth_shared_platform_data { struct mbus_dram_target_info *dram; - struct platform_device *shared_smi; /* * Max packet size for Tx IP/Layer 4 checksum, when set to 0, default * limit of 9KiB will be used. |