Merge branch 'master' into upstream

[karo-tx-linux.git] / drivers / net / mace.c

diff --git a/drivers/net/mace.c b/drivers/net/mace.c
index 47d7850da47b88bd2ce54d9783e1290f5620beb5..27c24eaa2414d26b53e7f6977d8ba659efc2e234 100644 (file)
--- a/drivers/net/mace.c
+++ b/drivers/net/mace.c
@@ -113,7 +113,7 @@ static int __devinit mace_probe(struct macio_dev *mdev, const struct of_device_i
        struct device_node *mace = macio_get_of_node(mdev);
        struct net_device *dev;
        struct mace_data *mp;
-       unsigned char *addr;
+       const unsigned char *addr;
        int j, rev, rc = -EBUSY;
 
        if (macio_resource_count(mdev) != 3 || macio_irq_count(mdev) != 3) {