Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev

[sfrench/cifs-2.6.git] / drivers / net / bmac.c

diff --git a/drivers/net/bmac.c b/drivers/net/bmac.c
index 00e5257b176f835a2842d7dd0ff854eeabc9c5b5..8dc657fc8afb37f18623efb160e58b216a615520 100644 (file)
--- a/drivers/net/bmac.c
+++ b/drivers/net/bmac.c
@@ -1261,7 +1261,7 @@ static void bmac_reset_and_enable(struct net_device *dev)
        spin_unlock_irqrestore(&bp->lock, flags);
 }
 
-static int __devinit bmac_probe(struct macio_dev *mdev, const struct of_match *match)
+static int __devinit bmac_probe(struct macio_dev *mdev, const struct of_device_id *match)
 {
        int j, rev, ret;
        struct bmac_data *bp;
@@ -1645,16 +1645,13 @@ static int __devexit bmac_remove(struct macio_dev *mdev)
        return 0;
 }
 
-static struct of_match bmac_match[] = 
+static struct of_device_id bmac_match[] = 
 {
        {
        .name           = "bmac",
-       .type           = OF_ANY_MATCH,
-       .compatible     = OF_ANY_MATCH,
        .data           = (void *)0,
        },
        {
-       .name           = OF_ANY_MATCH,
        .type           = "network",
        .compatible     = "bmac+",
        .data           = (void *)1,