1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/arm/etherh.c b/drivers/net/arm/etherh.c
index 4af235d41fda..03e217a868d4 100644
--- a/drivers/net/arm/etherh.c
+++ b/drivers/net/arm/etherh.c
@@ -527,7 +527,7 @@ static void __init etherh_banner(void)
 * Read the ethernet address string from the on board rom.
 * This is an ascii string...
 */
-static int __init etherh_addr(char *addr, struct expansion_card *ec)
+static int __devinit etherh_addr(char *addr, struct expansion_card *ec)
 {
        struct in_chunk_dir cd;
        char *s;
@@ -591,10 +591,11 @@ static void etherh_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *i
 static int etherh_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
        cmd->supported  = etherh_priv(dev)->supported;
-        cmd->speed      = SPEED_10;
+        ethtool_cmd_speed_set(cmd, SPEED_10);
        cmd->duplex     = DUPLEX_HALF;
        cmd->port       = dev->if_port == IF_PORT_10BASET ? PORT_TP : PORT_BNC;
-        cmd->autoneg    = dev->flags & IFF_AUTOMEDIA ? AUTONEG_ENABLE : AUTONEG_DISABLE;
+        cmd->autoneg    = (dev->flags & IFF_AUTOMEDIA ?
+                           AUTONEG_ENABLE : AUTONEG_DISABLE);
        return 0;
 }
@@ -655,7 +656,7 @@ static const struct net_device_ops etherh_netdev_ops = {
 static u32 etherh_regoffsets[16];
 static u32 etherm_regoffsets[16];
-static int __init
+static int __devinit
 etherh_probe(struct expansion_card *ec, const struct ecard_id *id)
 {
        const struct etherh_data *data = id->data;