diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-11 14:47:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-11 14:47:23 -0700 |
| commit | 6e21ce9d816b9ecc2349ad652fee9c6f28c43877 (patch) | |
| tree | a598c00d6f9615e99673d348de93b3d31adf4911 /drivers/ata/pata_ali.c | |
| parent | 01a6a7790e8e466584fc845f3cfc1770ffa1fee5 (diff) | |
| parent | 56fe23d5a702a39ee3bb29a04b55db292479d07a (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6:
pdc202xx_new: PLL detection fix
via82cxxx: add Arima W730-K8 and other rebadgings to short cables list
pmac: build fix
pata_ali/alim15x3: override 80-wire cable detection for Toshiba S1800-814
hpt366: UltraDMA filter for SATA cards (take 2)
ide: add ide_dev_is_sata() helper (take 2)
hpt366: fix PCI clock detection for HPT374 (take 4)
pdc202xx_new: fix PCI refcounting
ide: fix PCI refcounting
mpc8xx: Only build mpc8xx on arch/ppc
Diffstat (limited to 'drivers/ata/pata_ali.c')
| -rw-r--r-- | drivers/ata/pata_ali.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/ata/pata_ali.c b/drivers/ata/pata_ali.c index 94e5edc12ac..71bdc3b3189 100644 --- a/drivers/ata/pata_ali.c +++ b/drivers/ata/pata_ali.c @@ -48,6 +48,13 @@ static struct dmi_system_id cable_dmi_table[] = { DMI_MATCH(DMI_BOARD_VERSION, "OmniBook N32N-736"), }, }, + { + .ident = "Toshiba Satelite S1800-814", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), + DMI_MATCH(DMI_PRODUCT_NAME, "S1800-814"), + }, + }, { } }; |