summaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-12-08 18:47:25 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-12-08 18:47:25 -0800
commitf64001ef16312e94deb28297f5ffd4ada3e32ae9 (patch)
tree9b00f1efc3f593e9df7c7630ae29fd28d15df0a1 /drivers/char
parentb19d69c72d4e3da67f0feb2ecf45d6e60c82baf1 (diff)
parent76a9635979e543f04a5885198e68ff28e3311b67 (diff)
Merge tag 'char-misc-3.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull char/misc driver fixes from Greg KH: "Nothing huge, just a few small bugfixes for problems reported, and a device id update" * tag 'char-misc-3.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: mei: add 9 series PCH mei device ids drivers/char/i8k.c: add Dell XPLS L421X MAINTAINERS: add HSI subsystem misc: mic: Suppress memory space sparse warnings misc: mic: Fix endianness issues. misc: mic: Fix user space namespace pollution from mic_common.h. misc: mic: Bug fix for sysfs poll usage. misc: mic: Minor bug fix in 'retry' loops. misc: mic: Change mic_notify(...) to return true. extcon: remove freed groups caused the panic or warning in unregister flow extcon: arizona: Get pdata from arizona structure not device
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"),
+ },
+ },
{ }
};