summaryrefslogtreecommitdiff
path: root/drivers/char
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-01-02 10:28:41 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-01-02 10:29:02 -0800
commitf0f0ce97e128569d07fae98c62d8cff1e042fa1e (patch)
tree76276da8185d5dbbc679539315ed53fec52f7429 /drivers/char
parente8e32326279cba3d049b4325111f76618953195c (diff)
parentbef2a508b4276fd7897b2cb27df037d26361842c (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.c16
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"),
+ },
+ },
+ { }
};
/*