projects
/
linux-2.6-block.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
[linux-2.6-block.git]
/
drivers
/
input
/
touchscreen
/
goodix.c
diff --git
a/drivers/input/touchscreen/goodix.c
b/drivers/input/touchscreen/goodix.c
index b068ff8afbc9ad3ba62b70cbbee20feb572c3855..435714f18c23a61ca8cf2fcedaf6d6889b1f76a5 100644
(file)
--- a/
drivers/input/touchscreen/goodix.c
+++ b/
drivers/input/touchscreen/goodix.c
@@
-1510,7
+1510,7
@@
static int goodix_resume(struct device *dev)
static DEFINE_SIMPLE_DEV_PM_OPS(goodix_pm_ops, goodix_suspend, goodix_resume);
static const struct i2c_device_id goodix_ts_id[] = {
- { "GDIX1001:00"
, 0
},
+ { "GDIX1001:00" },
{ }
};
MODULE_DEVICE_TABLE(i2c, goodix_ts_id);