diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-23 11:29:11 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-23 11:29:11 +0200 |
| commit | 1e74f9cbbba5348a6c58988cce0f19d6ef887cc8 (patch) | |
| tree | 47fcfdba6a17a02cf6745146ebb2ae435405ab1a /drivers/ata/ata_piix.c | |
| parent | rcu: make rcutorture more vicious: reinstate boot-time testing (diff) | |
| parent | Slab: Fix memory leak in fallback_alloc() (diff) | |
| download | linux-1e74f9cbbba5348a6c58988cce0f19d6ef887cc8.tar.xz linux-1e74f9cbbba5348a6c58988cce0f19d6ef887cc8.zip | |
Merge branch 'linus' into core/rcu
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 81b7ae376951..a90ae03f56b2 100644 --- a/drivers/ata/ata_piix.c +++ b/drivers/ata/ata_piix.c @@ -1043,6 +1043,13 @@ static int piix_broken_suspend(void) }, }, { + .ident = "TECRA M4", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), + DMI_MATCH(DMI_PRODUCT_NAME, "TECRA M4"), + }, + }, + { .ident = "TECRA M5", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), |