X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=drivers%2Fnet%2Ftulip%2Ftimer.c;h=df326fe1cc8f4f3d9b35b43e2196c4fe9dbcbacf;hb=aaf1228ddfb44f04c87d1e7dfc5ccffdba74363d;hp=066e5d6bcbd8313c101fe5a8dac78d9e41de85e6;hpb=6b12a3d35ff6cb09f8b777ab258ea1e32c680d62;p=powerpc.git

diff --git a/drivers/net/tulip/timer.c b/drivers/net/tulip/timer.c
index 066e5d6bcb..df326fe1cc 100644
--- a/drivers/net/tulip/timer.c
+++ b/drivers/net/tulip/timer.c
@@ -18,10 +18,11 @@
 #include "tulip.h"
 
 
-void tulip_media_task(void *data)
+void tulip_media_task(struct work_struct *work)
 {
-	struct net_device *dev = data;
-	struct tulip_private *tp = netdev_priv(dev);
+	struct tulip_private *tp =
+		container_of(work, struct tulip_private, media_work);
+	struct net_device *dev = tp->dev;
 	void __iomem *ioaddr = tp->base_addr;
 	u32 csr12 = ioread32(ioaddr + CSR12);
 	int next_tick = 2*HZ;