diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-07 15:53:15 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-07 15:53:15 -0500 |
| commit | 94545baded0bfbabdc30a3a4cb48b3db479dd6ef (patch) | |
| tree | 1ce09d319261627a03ce8ef75055f3f6a4a35ea7 /drivers/ata/ata_piix.c | |
| parent | 7962024e9d16e9349d76b553326f3fa7be64305e (diff) | |
| parent | 459ad68893a84fb0881e57919340b97edbbc3dc7 (diff) | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
libata: kill spurious NCQ completion detection
ahci: don't attach if ICH6 is in combined mode
ata_piix: add Toshiba Tecra M4 to broken suspend list
ahci: fix engine reset failed message
Diffstat (limited to 'drivers/ata/ata_piix.c')
| -rw-r--r-- | drivers/ata/ata_piix.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c index b538e1d22bf2..bb62a588f489 100644 --- a/drivers/ata/ata_piix.c +++ b/drivers/ata/ata_piix.c | |||
| @@ -974,6 +974,13 @@ static int piix_broken_suspend(void) | |||
| 974 | }, | 974 | }, |
| 975 | }, | 975 | }, |
| 976 | { | 976 | { |
| 977 | .ident = "TECRA M4", | ||
| 978 | .matches = { | ||
| 979 | DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), | ||
| 980 | DMI_MATCH(DMI_PRODUCT_NAME, "Tecra M4"), | ||
| 981 | }, | ||
| 982 | }, | ||
| 983 | { | ||
| 977 | .ident = "TECRA M5", | 984 | .ident = "TECRA M5", |
| 978 | .matches = { | 985 | .matches = { |
| 979 | DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), | 986 | DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), |