aboutsummaryrefslogtreecommitdiff
path: root/drivers/char
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-12-12 10:22:21 +0000
committerMark Brown <broonie@linaro.org>2013-12-12 10:22:21 +0000
commit16c29dd8dd14a722836ca31440486feb2d730e29 (patch)
tree2f6b85ff48ddfe24c0f3688e4333695e18d469c7 /drivers/char
parentfae4bb16eec6425bd37495d8fa7d70bde98b368b (diff)
parent05bcf8f867f4af11c93395d4a6dd1dd52d8904ea (diff)
Merge tag 'v3.10.24' into linux-linaro-lsk
This is the 3.10.24 stable release
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/i8k.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/char/i8k.c b/drivers/char/i8k.c
index 40cc0cf2ded..e6939e13e33 100644
--- a/drivers/char/i8k.c
+++ b/drivers/char/i8k.c
@@ -664,6 +664,13 @@ static struct dmi_system_id __initdata i8k_dmi_table[] = {
DMI_MATCH(DMI_PRODUCT_NAME, "Vostro"),
},
},
+ {
+ .ident = "Dell XPS421",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+ DMI_MATCH(DMI_PRODUCT_NAME, "XPS L421X"),
+ },
+ },
{ }
};