Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6

[pandora-kernel.git] / drivers / net / macmace.c

diff --git a/drivers/net/macmace.c b/drivers/net/macmace.c
index c685a46..4286e67 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;