diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-01-10 12:01:14 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-01-10 12:01:14 +0800 |
| commit | 7785301d9209cf083369c6f088cd1d48ec417863 (patch) | |
| tree | 693ad3a1ebdc818a37abebbd8257820604ea8a35 /drivers/input/misc | |
| parent | 19192a140ad72b5bd0d57620bfe236bc03561bb6 (diff) | |
| parent | f02e043c5ee3014ba0fbae38e699008385c99d7b (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Diffstat (limited to 'drivers/input/misc')
| -rw-r--r-- | drivers/input/misc/drv260x.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/input/misc/drv260x.c b/drivers/input/misc/drv260x.c index 2adfd86c869a..930424e55439 100644 --- a/drivers/input/misc/drv260x.c +++ b/drivers/input/misc/drv260x.c @@ -592,7 +592,6 @@ static int drv260x_probe(struct i2c_client *client, } haptics->input_dev->name = "drv260x:haptics"; - haptics->input_dev->dev.parent = client->dev.parent; haptics->input_dev->close = drv260x_close; input_set_drvdata(haptics->input_dev, haptics); input_set_capability(haptics->input_dev, EV_FF, FF_RUMBLE); |