Merge branches 'kbuild', 'packaging' and 'misc' of git://git.kernel.org/pub/scm/linux...

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

diff --git a/drivers/net/macmace.c b/drivers/net/macmace.c
index c685a4656878c7793e222e448eab39c75dc93c5f..4286e67f9634dc1f2126fe63130bfda026773c15 100644 (file)
--- a/drivers/net/macmace.c
+++ b/drivers/net/macmace.c
@@ -221,7 +221,7 @@ static int __devinit mace_probe(struct platform_device *pdev)
        SET_NETDEV_DEV(dev, &pdev->dev);
 
        dev->base_addr = (u32)MACE_BASE;
-       mp->mace = (volatile struct mace *) MACE_BASE;
+       mp->mace = MACE_BASE;
 
        dev->irq = IRQ_MAC_MACE;
        mp->dma_intr = IRQ_MAC_MACE_DMA;