diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-01-30 18:50:17 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-01-30 18:50:17 -0500 |
| commit | 4eece4ccf997c0e6d8fdad3d842e37b16b8d705f (patch) | |
| tree | b8ddfaa3401a6af36ab06829b1b0c31e0ff2fb38 /drivers/ata | |
| parent | cda13dd164f91df79ba797ab84848352b03de115 (diff) | |
| parent | 4fb4c5582475452d3bf7c5072ef2d15ee06f7723 (diff) | |
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) | |||
| 494 | 494 | ||
| 495 | 495 | ||
| 496 | static struct of_device_id mpc52xx_ata_of_match[] = { | 496 | static struct of_device_id mpc52xx_ata_of_match[] = { |
| 497 | { | 497 | { .compatible = "fsl,mpc5200-ata", }, |
| 498 | .type = "ata", | 498 | { .compatible = "mpc5200-ata", }, |
| 499 | .compatible = "mpc5200-ata", | ||
| 500 | }, | ||
| 501 | {}, | 499 | {}, |
| 502 | }; | 500 | }; |
| 503 | 501 | ||