diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-02 13:28:41 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-02 13:29:02 -0500 |
| commit | f0f0ce97e128569d07fae98c62d8cff1e042fa1e (patch) | |
| tree | 76276da8185d5dbbc679539315ed53fec52f7429 /drivers/char | |
| parent | e8e32326279cba3d049b4325111f76618953195c (diff) | |
| parent | bef2a508b4276fd7897b2cb27df037d26361842c (diff) | |
Merge branch 'i8k-updates' from Alan
* i8k-updates:
i8k: Add Dell Vostro systems
i8k: Enable i8k on Dell Precision Systems
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/i8k.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/drivers/char/i8k.c b/drivers/char/i8k.c index b60d425ce8d1..fc8cf7ac7f2b 100644 --- a/drivers/char/i8k.c +++ b/drivers/char/i8k.c | |||
| @@ -485,7 +485,21 @@ static struct dmi_system_id __initdata i8k_dmi_table[] = { | |||
| 485 | DMI_MATCH(DMI_PRODUCT_NAME, "MP061"), | 485 | DMI_MATCH(DMI_PRODUCT_NAME, "MP061"), |
| 486 | }, | 486 | }, |
| 487 | }, | 487 | }, |
| 488 | { } | 488 | { |
| 489 | .ident = "Dell Precision", | ||
| 490 | .matches = { | ||
| 491 | DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), | ||
| 492 | DMI_MATCH(DMI_PRODUCT_NAME, "Precision"), | ||
| 493 | }, | ||
| 494 | }, | ||
| 495 | { | ||
| 496 | .ident = "Dell Vostro", | ||
| 497 | .matches = { | ||
| 498 | DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), | ||
| 499 | DMI_MATCH(DMI_PRODUCT_NAME, "Vostro"), | ||
| 500 | }, | ||
| 501 | }, | ||
| 502 | { } | ||
| 489 | }; | 503 | }; |
| 490 | 504 | ||
| 491 | /* | 505 | /* |