diff options
| author | Linus Torvalds | 2009-01-02 19:28:41 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2009-01-02 19:29:02 +0100 |
| commit | f0f0ce97e128569d07fae98c62d8cff1e042fa1e (patch) | |
| tree | 76276da8185d5dbbc679539315ed53fec52f7429 /drivers/char | |
| parent | Fix compiler warning in arch/x86/mm/init_32.c (diff) | |
| parent | i8k: Add Dell Vostro systems (diff) | |
| download | kernel-qcow2-linux-f0f0ce97e128569d07fae98c62d8cff1e042fa1e.tar.gz kernel-qcow2-linux-f0f0ce97e128569d07fae98c62d8cff1e042fa1e.tar.xz kernel-qcow2-linux-f0f0ce97e128569d07fae98c62d8cff1e042fa1e.zip | |
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[] = { DMI_MATCH(DMI_PRODUCT_NAME, "MP061"), }, }, - { } + { + .ident = "Dell Precision", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "Precision"), + }, + }, + { + .ident = "Dell Vostro", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "Vostro"), + }, + }, + { } }; /* |