diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-02-11 13:37:49 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-02-11 13:37:49 +1100 |
| commit | 6a4d7a90fc452171eabb4b5b23ab780451ae7f5b (patch) | |
| tree | ddd39820114f1d7e66c47516139ccf2d45a6f019 /drivers/net | |
| parent | edbc29d76ddbc9bd56e1cbc772188f70c616ffe1 (diff) | |
| parent | bdad05489fe5f7487c7a22ef311f005cb62ebbb6 (diff) | |
Merge commit 'gcl/next' into next
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/fec_mpc52xx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/fec_mpc52xx.c b/drivers/net/fec_mpc52xx.c index cd8e98b45ec..049b0a7e01f 100644 --- a/drivers/net/fec_mpc52xx.c +++ b/drivers/net/fec_mpc52xx.c @@ -1123,9 +1123,9 @@ static int mpc52xx_fec_of_resume(struct of_device *op) #endif static struct of_device_id mpc52xx_fec_match[] = { - { .type = "network", .compatible = "fsl,mpc5200b-fec", }, - { .type = "network", .compatible = "fsl,mpc5200-fec", }, - { .type = "network", .compatible = "mpc5200-fec", }, + { .compatible = "fsl,mpc5200b-fec", }, + { .compatible = "fsl,mpc5200-fec", }, + { .compatible = "mpc5200-fec", }, { } }; |