Merge commit 'v2.6.30-rc5' into core/iommu

Merge reason: core/iommu was on an .30-rc1 base,
              update it to .30-rc5 to refresh.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 14 insertions, 7 deletions

diff --git a/drivers/net/arm/ep93xx_eth.c b/drivers/net/arm/ep93xx_eth.c
index cc7708775da0..b72b3d639f6e 100644
--- a/drivers/net/arm/ep93xx_eth.c
+++ b/drivers/net/arm/ep93xx_eth.c
@@ -153,7 +153,7 @@ struct ep93xx_descs
 struct ep93xx_priv
 {
         struct resource         *res;
-        void                    *base_addr;
+        void __iomem            *base_addr;
         int                     irq;
 
         struct ep93xx_descs     *descs;
@@ -770,7 +770,18 @@ static struct ethtool_ops ep93xx_ethtool_ops = {
         .get_link               = ep93xx_get_link,
 };
 
-struct net_device *ep93xx_dev_alloc(struct ep93xx_eth_data *data)
+static const struct net_device_ops ep93xx_netdev_ops = {
+        .ndo_open               = ep93xx_open,
+        .ndo_stop               = ep93xx_close,
+        .ndo_start_xmit         = ep93xx_xmit,
+        .ndo_get_stats          = ep93xx_get_stats,
+        .ndo_do_ioctl           = ep93xx_ioctl,
+        .ndo_validate_addr      = eth_validate_addr,
+        .ndo_change_mtu         = eth_change_mtu,
+        .ndo_set_mac_address    = eth_mac_addr,
+};
+
+static struct net_device *ep93xx_dev_alloc(struct ep93xx_eth_data *data)
 {
         struct net_device *dev;
 
@@ -780,12 +791,8 @@ struct net_device *ep93xx_dev_alloc(struct ep93xx_eth_data *data)
 
         memcpy(dev->dev_addr, data->dev_addr, ETH_ALEN);
 
-        dev->get_stats = ep93xx_get_stats;
         dev->ethtool_ops = &ep93xx_ethtool_ops;
-        dev->hard_start_xmit = ep93xx_xmit;
-        dev->open = ep93xx_open;
-        dev->stop = ep93xx_close;
-        dev->do_ioctl = ep93xx_ioctl;
+        dev->netdev_ops = &ep93xx_netdev_ops;
 
         dev->features |= NETIF_F_SG | NETIF_F_HW_CSUM;