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
/
wdt87xx_i2c.c
diff --git
a/drivers/input/touchscreen/wdt87xx_i2c.c
b/drivers/input/touchscreen/wdt87xx_i2c.c
index 32c7be54434cf26444eef7b8a3a34277c40049bd..698fc7e0ee7f865a57418dad7fa27f3db8d055af 100644
(file)
--- a/
drivers/input/touchscreen/wdt87xx_i2c.c
+++ b/
drivers/input/touchscreen/wdt87xx_i2c.c
@@
-1148,7
+1148,7
@@
static int wdt87xx_resume(struct device *dev)
static DEFINE_SIMPLE_DEV_PM_OPS(wdt87xx_pm_ops, wdt87xx_suspend, wdt87xx_resume);
static const struct i2c_device_id wdt87xx_dev_id[] = {
- { WDT87XX_NAME
, 0
},
+ { WDT87XX_NAME },
{ }
};
MODULE_DEVICE_TABLE(i2c, wdt87xx_dev_id);