Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / staging / et131x / et131x_initpci.c

diff --git a/drivers/staging/et131x/et131x_initpci.c b/drivers/staging/et131x/et131x_initpci.c
index 10bcb45d73a38e8d70a5b72da76b80746ae76922..f62ba7a68f344c69284eff577cb9ebd4567ff365 100644 (file)
--- a/drivers/staging/et131x/et131x_initpci.c
+++ b/drivers/staging/et131x/et131x_initpci.c
@@ -783,7 +783,7 @@ static void __devexit et131x_pci_remove(struct pci_dev *pdev)
        /* Retrieve the net_device pointer from the pci_dev struct, as well
         * as the private adapter struct
         */
-       netdev = (struct net_device *) pci_get_drvdata(pdev);
+       netdev = pci_get_drvdata(pdev);
        adapter = netdev_priv(netdev);
 
        /* Perform device cleanup */