summaryrefslogtreecommitdiffstats
path: root/drivers/input/touchscreen/da9034-ts.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2015-01-15 18:46:14 +0100
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2015-01-15 18:46:14 +0100
commit0c49cd295d42d0032af11d55e2140dbec11dc8d0 (patch)
tree1e7d0e50b6b6d6e4de1fb6bb0b6d856c3932da58 /drivers/input/touchscreen/da9034-ts.c
parentInput: evdev - flush pending events on clock type change (diff)
parentlinux 3.19-rc4 (diff)
downloadlinux-0c49cd295d42d0032af11d55e2140dbec11dc8d0.tar.xz
linux-0c49cd295d42d0032af11d55e2140dbec11dc8d0.zip
Merge tag 'v3.19-rc4' into next
Merge with mainline to bring in the latest thermal and other changes.
Diffstat (limited to 'drivers/input/touchscreen/da9034-ts.c')
-rw-r--r--drivers/input/touchscreen/da9034-ts.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/da9034-ts.c b/drivers/input/touchscreen/da9034-ts.c
index cf6f4b31db4d..8264822dc4b9 100644
--- a/drivers/input/touchscreen/da9034-ts.c
+++ b/drivers/input/touchscreen/da9034-ts.c
@@ -357,7 +357,6 @@ static int da9034_touch_probe(struct platform_device *pdev)
static struct platform_driver da9034_touch_driver = {
.driver = {
.name = "da9034-touch",
- .owner = THIS_MODULE,
},
.probe = da9034_touch_probe,
};