Merge remote-tracking branch 'input-current/for-linus'

[karo-tx-linux.git] / drivers / net / ethernet / ibm / emac / core.h

diff --git a/drivers/net/ethernet/ibm/emac/core.h b/drivers/net/ethernet/ibm/emac/core.h
index ac02c675c59c4167b4870c892c6afcceb13aec4c..93ae11494810a2a3d9804309cf175a9e967ce27e 100644 (file)
--- a/drivers/net/ethernet/ibm/emac/core.h
+++ b/drivers/net/ethernet/ibm/emac/core.h
@@ -181,7 +181,7 @@ struct emac_instance {
        struct mal_commac               commac;
 
        /* PHY infos */
-       u32                             phy_mode;
+       int                             phy_mode;
        u32                             phy_map;
        u32                             phy_address;
        u32                             phy_feat_exc;