Merge commit 'v3.1-rc4' into next

[deliverable/linux.git] / drivers / net / typhoon.c

diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c
index 3de4283344e9824f0a074ea2e0cffb3e8a05316e..1d5091a1e49a441c383a140432290cc351ecd29f 100644 (file)
--- a/drivers/net/typhoon.c
+++ b/drivers/net/typhoon.c
@@ -2367,7 +2367,7 @@ typhoon_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 
        dev->irq = pdev->irq;
        tp = netdev_priv(dev);
-       tp->shared = (struct typhoon_shared *) shared;
+       tp->shared = shared;
        tp->shared_dma = shared_dma;
        tp->pdev = pdev;
        tp->tx_pdev = pdev;