diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-02 13:40:20 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-02 13:40:20 -0400 |
| commit | 2910ca6f8ae69648623b3c05b79be87dd7bda73d (patch) | |
| tree | 65b37405618fc494aaa5c7b5be247d7e9cffec0d /drivers | |
| parent | d237098c03eb91cef240e9a1b248c0e1ecd1c80c (diff) | |
| parent | 4c74d4ec3524a8f31deadd115139dd93bc91d598 (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:
ata_piix: add another TECRA M3 entry to broken suspend list
Diffstat (limited to 'drivers')
| -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 3b8bf1812dc8..6996eb5b7506 100644 --- a/drivers/ata/ata_piix.c +++ b/drivers/ata/ata_piix.c | |||
| @@ -921,6 +921,13 @@ static int piix_broken_suspend(void) | |||
| 921 | { | 921 | { |
| 922 | static struct dmi_system_id sysids[] = { | 922 | static struct dmi_system_id sysids[] = { |
| 923 | { | 923 | { |
| 924 | .ident = "TECRA M3", | ||
| 925 | .matches = { | ||
| 926 | DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), | ||
| 927 | DMI_MATCH(DMI_PRODUCT_NAME, "TECRA M3"), | ||
| 928 | }, | ||
| 929 | }, | ||
| 930 | { | ||
| 924 | .ident = "TECRA M5", | 931 | .ident = "TECRA M5", |
| 925 | .matches = { | 932 | .matches = { |
| 926 | DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), | 933 | DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), |