diff --git a/[refs] b/[refs] index 564b1f0b07b1..54aa5ba312b8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0ace285605314c54339710484b54814945a60df8 +refs/heads/master: 47fd5b8373ecc6bf5473e4139b62b06425448252 diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h index 6095af572dfd..76a89f8e6a19 100644 --- a/trunk/include/linux/netdevice.h +++ b/trunk/include/linux/netdevice.h @@ -545,6 +545,7 @@ struct netdev_queue { * * void (*ndo_poll_controller)(struct net_device *dev); */ +#define HAVE_NET_DEVICE_OPS struct net_device_ops { int (*ndo_init)(struct net_device *dev); void (*ndo_uninit)(struct net_device *dev);