diff options
| author |   Paul Mackerras <paulus@samba.org> | 2008-01-31 10:50:17 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-01-31 10:50:17 +1100 |
| commit | 4eece4ccf997c0e6d8fdad3d842e37b16b8d705f (patch) | |
| tree | b8ddfaa3401a6af36ab06829b1b0c31e0ff2fb38 /drivers/ata | |
| parent | [POWERPC] 83xx: Clean up / convert mpc83xx board DTS files to v1 format. (diff) | |
| parent | [POWERPC] mpc52xx_psc_spi device driver must not touch port_config and cdm (diff) | |
| download | linux-dev-4eece4ccf997c0e6d8fdad3d842e37b16b8d705f.tar.xz linux-dev-4eece4ccf997c0e6d8fdad3d842e37b16b8d705f.zip | |
Merge branch 'for-2.6.25' of git://git.secretlab.ca/git/linux-2.6-mpc52xx
Diffstat (limited to 'drivers/ata')
| -rw-r--r-- | drivers/ata/pata_mpc52xx.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/ata/pata_mpc52xx.c b/drivers/ata/pata_mpc52xx.c index 50c56e2814c1..1a7ca37168b2 100644 --- a/drivers/ata/pata_mpc52xx.c +++ b/drivers/ata/pata_mpc52xx.c @@ -494,10 +494,8 @@ mpc52xx_ata_resume(struct of_device *op) static struct of_device_id mpc52xx_ata_of_match[] = { - { - .type = "ata", - .compatible = "mpc5200-ata", - }, + { .compatible = "fsl,mpc5200-ata", }, + { .compatible = "mpc5200-ata", }, {}, }; |