Merge tag 'vfio-v5.6-rc1' of git://github.com/awilliam/linux-vfio

[linux.git] / arch / um / drivers / net_kern.c

diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c
index 327b728f72445332bb26cb2e993548a900de2ada..35ebeebfc1a8ad07ee0119bd85d264f21b13bcdd 100644 (file)
--- a/arch/um/drivers/net_kern.c
+++ b/arch/um/drivers/net_kern.c
@@ -247,7 +247,7 @@ static void uml_net_set_multicast_list(struct net_device *dev)
        return;
 }
 
-static void uml_net_tx_timeout(struct net_device *dev)
+static void uml_net_tx_timeout(struct net_device *dev, unsigned int txqueue)
 {
        netif_trans_update(dev);
        netif_wake_queue(dev);