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 'next' into for-linus
[sfrench/cifs-2.6.git]
/
drivers
/
input
/
touchscreen
/
goodix.c
diff --git
a/drivers/input/touchscreen/goodix.c
b/drivers/input/touchscreen/goodix.c
index e36162b28c2aae268166c2e735e318b793b9dfa8..4d113c9e4b77103224924128d1d033af21b4e552 100644
(file)
--- a/
drivers/input/touchscreen/goodix.c
+++ b/
drivers/input/touchscreen/goodix.c
@@
-420,6
+420,7
@@
static const struct i2c_device_id goodix_ts_id[] = {
{ "GDIX1001:00", 0 },
{ }
};
{ "GDIX1001:00", 0 },
{ }
};
+MODULE_DEVICE_TABLE(i2c, goodix_ts_id);
#ifdef CONFIG_ACPI
static const struct acpi_device_id goodix_acpi_match[] = {
#ifdef CONFIG_ACPI
static const struct acpi_device_id goodix_acpi_match[] = {
@@
-448,7
+449,6
@@
static struct i2c_driver goodix_ts_driver = {
.id_table = goodix_ts_id,
.driver = {
.name = "Goodix-TS",
.id_table = goodix_ts_id,
.driver = {
.name = "Goodix-TS",
- .owner = THIS_MODULE,
.acpi_match_table = ACPI_PTR(goodix_acpi_match),
.of_match_table = of_match_ptr(goodix_of_match),
},
.acpi_match_table = ACPI_PTR(goodix_acpi_match),
.of_match_table = of_match_ptr(goodix_of_match),
},