LOCKD: Make lockd_up() and lockd_down() exported GPL-only

[linux-2.6-omap-h63xx.git] / include / linux / mv643xx_eth.h

diff --git a/include/linux/mv643xx_eth.h b/include/linux/mv643xx_eth.h
index eb78b00edcde6a651b418e8fcb71ed504c6a7a07..cbbbe9bfecad0652334963de2cd8363c43e6b28a 100644 (file)
--- a/include/linux/mv643xx_eth.h
+++ b/include/linux/mv643xx_eth.h
@@ -17,9 +17,14 @@
 
 struct mv643xx_eth_shared_platform_data {
        struct mbus_dram_target_info    *dram;
+       struct platform_device  *shared_smi;
        unsigned int            t_clk;
 };
 
+#define MV643XX_ETH_PHY_ADDR_DEFAULT   0
+#define MV643XX_ETH_PHY_ADDR(x)                (0x80 | (x))
+#define MV643XX_ETH_PHY_NONE           0xff
+
 struct mv643xx_eth_platform_data {
        /*
         * Pointer back to our parent instance, and our port number.
@@ -30,8 +35,6 @@ struct mv643xx_eth_platform_data {
        /*
         * Whether a PHY is present, and if yes, at which address.
         */
-       struct platform_device  *shared_smi;
-       int                     force_phy_addr;
        int                     phy_addr;
 
        /*