diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-09-13 11:24:25 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-09-13 11:24:25 -0400 |
| commit | b2315372eac9cd9f622c32a93e323cf6f0f03462 (patch) | |
| tree | 9e1faa7cdcddf5d90bec4fb9523742d4cce699a1 /drivers/ide/pci/alim15x3.c | |
| parent | 5326152fa182b0a16e4abf913ce403e3c7ab53b7 (diff) | |
| parent | c87ce65868bbf9bbea9c3f112ff8315302daf8f2 (diff) | |
Merge branch 'linux-2.6' into for-2.6.24
Diffstat (limited to 'drivers/ide/pci/alim15x3.c')
| -rw-r--r-- | drivers/ide/pci/alim15x3.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c index 025689de50e9..11ecb618007c 100644 --- a/drivers/ide/pci/alim15x3.c +++ b/drivers/ide/pci/alim15x3.c | |||
| @@ -596,6 +596,13 @@ static struct dmi_system_id cable_dmi_table[] = { | |||
| 596 | DMI_MATCH(DMI_BOARD_VERSION, "OmniBook N32N-736"), | 596 | DMI_MATCH(DMI_BOARD_VERSION, "OmniBook N32N-736"), |
| 597 | }, | 597 | }, |
| 598 | }, | 598 | }, |
| 599 | { | ||
| 600 | .ident = "Toshiba Satellite S1800-814", | ||
| 601 | .matches = { | ||
| 602 | DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), | ||
| 603 | DMI_MATCH(DMI_PRODUCT_NAME, "S1800-814"), | ||
| 604 | }, | ||
| 605 | }, | ||
| 599 | { } | 606 | { } |
| 600 | }; | 607 | }; |
| 601 | 608 | ||