include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit...

[mv-sheeva.git] / drivers / uwb / i1480 / i1480u-wlp / lc.c

diff --git a/drivers/uwb/i1480/i1480u-wlp/lc.c b/drivers/uwb/i1480/i1480u-wlp/lc.c
index 049c05d4cc6aa42c1228209210f1786d2ce3c0ff..def778cf221690846df58dafe75794aaded7184a 100644 (file)
--- a/drivers/uwb/i1480/i1480u-wlp/lc.c
+++ b/drivers/uwb/i1480/i1480u-wlp/lc.c
@@ -55,6 +55,7 @@
  *                          is being removed.
  *         i1480u_rm()
  */
+#include <linux/gfp.h>
 #include <linux/if_arp.h>
 #include <linux/etherdevice.h>
 
@@ -181,6 +182,15 @@ error:
 }
 #endif
 
+static const struct net_device_ops i1480u_netdev_ops = {
+       .ndo_open       = i1480u_open,
+       .ndo_stop       = i1480u_stop,
+       .ndo_start_xmit = i1480u_hard_start_xmit,
+       .ndo_tx_timeout = i1480u_tx_timeout,
+       .ndo_set_config = i1480u_set_config,
+       .ndo_change_mtu = i1480u_change_mtu,
+};
+
 static
 int i1480u_add(struct i1480u *i1480u, struct usb_interface *iface)
 {
@@ -235,13 +245,7 @@ int i1480u_add(struct i1480u *i1480u, struct usb_interface *iface)
        net_dev->features |= NETIF_F_HIGHDMA;
        net_dev->watchdog_timeo = 5*HZ;         /* FIXME: a better default? */
 
-       net_dev->open = i1480u_open;
-       net_dev->stop = i1480u_stop;
-       net_dev->hard_start_xmit = i1480u_hard_start_xmit;
-       net_dev->tx_timeout = i1480u_tx_timeout;
-       net_dev->get_stats = i1480u_get_stats;
-       net_dev->set_config = i1480u_set_config;
-       net_dev->change_mtu = i1480u_change_mtu;
+       net_dev->netdev_ops = &i1480u_netdev_ops;
 
 #ifdef i1480u_FLOW_CONTROL
        /* Notification endpoint setup (submitted when we open the device) */