Merge branch 'linus' into percpu-cpumask-x86-for-linus-2

Conflicts:
	arch/sparc/kernel/time_64.c
	drivers/gpu/drm/drm_proc.c

Manual merge to resolve build warning due to phys_addr_t type change
on x86:

	drivers/gpu/drm/drm_info.c

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

1 files changed, 12 insertions, 5 deletions

diff --git a/drivers/net/eexpress.c b/drivers/net/eexpress.c
index 9ff3f2f5e382..1686dca28748 100644
--- a/drivers/net/eexpress.c
+++ b/drivers/net/eexpress.c
@@ -1043,6 +1043,17 @@ static void eexp_hw_tx_pio(struct net_device *dev, unsigned short *buf,
         lp->last_tx = jiffies;
 }
 
+static const struct net_device_ops eexp_netdev_ops = {
+        .ndo_open               = eexp_open,
+        .ndo_stop               = eexp_close,
+        .ndo_start_xmit         = eexp_xmit,
+        .ndo_set_multicast_list = eexp_set_multicast,
+        .ndo_tx_timeout         = eexp_timeout,
+        .ndo_change_mtu         = eth_change_mtu,
+        .ndo_set_mac_address    = eth_mac_addr,
+        .ndo_validate_addr      = eth_validate_addr,
+};
+
 /*
  * Sanity check the suspected EtherExpress card
  * Read hardware address, reset card, size memory and initialize buffer
@@ -1163,11 +1174,7 @@ static int __init eexp_hw_probe(struct net_device *dev, unsigned short ioaddr)
         lp->rx_buf_start = TX_BUF_START + (lp->num_tx_bufs*TX_BUF_SIZE);
         lp->width = buswidth;
 
-        dev->open = eexp_open;
-        dev->stop = eexp_close;
-        dev->hard_start_xmit = eexp_xmit;
-        dev->set_multicast_list = &eexp_set_multicast;
-        dev->tx_timeout = eexp_timeout;
+        dev->netdev_ops = &eexp_netdev_ops;
         dev->watchdog_timeo = 2*HZ;
 
         return register_netdev(dev);