diff --git a/[refs] b/[refs]
index 76746c9ba061..5b13b88f3f54 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 802aa9c058f2046f0a5683f04d7755c362734010
+refs/heads/master: a31ff3880578c37fd5c71ee863c23897dacfa9f8
diff --git a/trunk/drivers/net/s2io.c b/trunk/drivers/net/s2io.c
index ecc25aab896a..0f4219cb0be2 100644
--- a/trunk/drivers/net/s2io.c
+++ b/trunk/drivers/net/s2io.c
@@ -8321,8 +8321,7 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
 
 static void __devexit s2io_rem_nic(struct pci_dev *pdev)
 {
-	struct net_device *dev =
-		(struct net_device *)pci_get_drvdata(pdev);
+	struct net_device *dev = pci_get_drvdata(pdev);
 	struct s2io_nic *sp;
 
 	if (dev == NULL) {