Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[pandora-kernel.git] / drivers / net / bcm63xx_enet.c

diff --git a/drivers/net/bcm63xx_enet.c b/drivers/net/bcm63xx_enet.c
index c48104b..4753bb9 100644 (file)
--- a/drivers/net/bcm63xx_enet.c
+++ b/drivers/net/bcm63xx_enet.c
@@ -18,6 +18,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 #include <linux/init.h>
+#include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/clk.h>
 #include <linux/etherdevice.h>
@@ -839,8 +840,8 @@ static int bcm_enet_open(struct net_device *dev)
        if (ret)
                goto out_phy_disconnect;
 
-       ret = request_irq(priv->irq_rx, bcm_enet_isr_dma,
-                         IRQF_SAMPLE_RANDOM | IRQF_DISABLED, dev->name, dev);
+       ret = request_irq(priv->irq_rx, bcm_enet_isr_dma, IRQF_DISABLED,
+                         dev->name, dev);
        if (ret)
                goto out_freeirq;
 
@@ -1346,7 +1347,8 @@ static int bcm_enet_get_settings(struct net_device *dev,
                return phy_ethtool_gset(priv->phydev, cmd);
        } else {
                cmd->autoneg = 0;
-               cmd->speed = (priv->force_speed_100) ? SPEED_100 : SPEED_10;
+               ethtool_cmd_speed_set(cmd, ((priv->force_speed_100)
+                                           ? SPEED_100 : SPEED_10));
                cmd->duplex = (priv->force_duplex_full) ?
                        DUPLEX_FULL : DUPLEX_HALF;
                cmd->supported = ADVERTISED_10baseT_Half  |