git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' into next
[sfrench/cifs-2.6.git]
/
drivers
/
input
/
touchscreen
/
silead.c
diff --git
a/drivers/input/touchscreen/silead.c
b/drivers/input/touchscreen/silead.c
index 09241d4cdebca340625f5e08345b10b7822114e0..06f0eb04a8fd4b2d331d084b885516de9e3bc30d 100644
(file)
--- a/
drivers/input/touchscreen/silead.c
+++ b/
drivers/input/touchscreen/silead.c
@@
-617,6
+617,7
@@
static const struct acpi_device_id silead_ts_acpi_match[] = {
{ "MSSL1680", 0 },
{ "MSSL0001", 0 },
{ "MSSL0002", 0 },
+ { "MSSL0017", 0 },
{ }
};
MODULE_DEVICE_TABLE(acpi, silead_ts_acpi_match);