diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-07-13 19:11:44 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-07-13 19:11:44 -0400 |
| commit | 08cd84c81f27d5bd22ba958b7cae6d566c509280 (patch) | |
| tree | 6fdb546c151410851fd3c604d42590afa4215084 /drivers/net/mace.c | |
| parent | e9dd2561793c05d70c9df1bc16a2dde6f23388df (diff) | |
| parent | 327309e899662b482c58cf25f574513d38b5788c (diff) | |
Merge /spare/repo/netdev-2.6 branch 'ieee80211'
Diffstat (limited to 'drivers/net/mace.c')
| -rw-r--r-- | drivers/net/mace.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/mace.c b/drivers/net/mace.c index 6ed2d7dbd44c..81d0a26e4f41 100644 --- a/drivers/net/mace.c +++ b/drivers/net/mace.c @@ -109,7 +109,7 @@ bitrev(int b) } -static int __devinit mace_probe(struct macio_dev *mdev, const struct of_match *match) +static int __devinit mace_probe(struct macio_dev *mdev, const struct of_device_id *match) { struct device_node *mace = macio_get_of_node(mdev); struct net_device *dev; @@ -1009,12 +1009,10 @@ static irqreturn_t mace_rxdma_intr(int irq, void *dev_id, struct pt_regs *regs) return IRQ_HANDLED; } -static struct of_match mace_match[] = +static struct of_device_id mace_match[] = { { .name = "mace", - .type = OF_ANY_MATCH, - .compatible = OF_ANY_MATCH }, {}, }; |