diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-04 00:41:10 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-04 00:41:10 +0200 |
| commit | cd1d2d279a4b149301ef0316d12ba4b29424a802 (patch) | |
| tree | 206ac2ae7c210e55b1e1ff0872ffb70ecdcecc7c /drivers/ata | |
| parent | rxrpc: remove smp_processor_id() from debug macro (diff) | |
| parent | [POWERPC] Fix MPC5200 (not B!) device tree so FEC ethernet works (diff) | |
| download | linux-cd1d2d279a4b149301ef0316d12ba4b29424a802.tar.xz linux-cd1d2d279a4b149301ef0316d12ba4b29424a802.zip | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] Fix MPC5200 (not B!) device tree so FEC ethernet works
[POWERPC] mpc5200: Amalgamated DTS fixes and updates
[POWERPC] Fix rtas_flash procfs interface
[POWERPC] Fix deadlock with mmu_hash_lock in hash_page_sync
[POWERPC] Fix iSeries hard irq enabling regression
[POWERPC] Fix CPM2 SCC1 clock initialization.
[POWERPC] Fix defconfigs so we dont set both GENRTC and RTCLIB
[POWERPC] fsldma: Use compatiable binding as spec
[POWERPC] sata_fsl: reduce compatibility to fsl,pq-sata
[POWERPC] 83xx: enable usb in 837x rdb and 83xx defconfigs
[POWERPC] 83xx: Fix wrong USB phy type in mpc837xrdb dts
Diffstat (limited to 'drivers/ata')
| -rw-r--r-- | drivers/ata/sata_fsl.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/ata/sata_fsl.c b/drivers/ata/sata_fsl.c index 07791a7a48a5..4c1985511548 100644 --- a/drivers/ata/sata_fsl.c +++ b/drivers/ata/sata_fsl.c @@ -1348,10 +1348,7 @@ static int sata_fsl_remove(struct of_device *ofdev) static struct of_device_id fsl_sata_match[] = { { - .compatible = "fsl,mpc8315-sata", - }, - { - .compatible = "fsl,mpc8379-sata", + .compatible = "fsl,pq-sata", }, {}, }; |