Merge commit 'origin/master'

[linux-2.6-omap-h63xx.git] / include / linux / netdevice.h

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 9c5a68850114db80390db3810eb158094d779a80..812bcd8b436323907785b8c0c756807242c1033f 100644 (file)
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -636,8 +636,6 @@ struct net_device
        unsigned int            real_num_tx_queues;
 
        unsigned long           tx_queue_len;   /* Max frames per queue allowed */
-       spinlock_t              qdisc_list_lock;
-       struct list_head        qdisc_list;
 
 /*
  * One part is mostly used on xmit path (device)