summaryrefslogtreecommitdiffstats
path: root/drivers/iio/orientation/hid-sensor-rotation.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman2016-11-14 08:11:29 +0100
committerGreg Kroah-Hartman2016-11-14 08:11:29 +0100
commit8a0a8e1c42fdf656e7b729e9c468c2caa687adb7 (patch)
treebde58e16dd5e6912deccac7e41b9a95f05187ea6 /drivers/iio/orientation/hid-sensor-rotation.c
parentUSB: cdc-acm: use get_icount tty operation (diff)
parentLinux 4.9-rc5 (diff)
downloadkernel-qcow2-linux-8a0a8e1c42fdf656e7b729e9c468c2caa687adb7.tar.gz
kernel-qcow2-linux-8a0a8e1c42fdf656e7b729e9c468c2caa687adb7.tar.xz
kernel-qcow2-linux-8a0a8e1c42fdf656e7b729e9c468c2caa687adb7.zip
Merge 4.9-rc5 into usb-next
We want/need the USB fixes in here as well, for testing and merge issues. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/iio/orientation/hid-sensor-rotation.c')
-rw-r--r--drivers/iio/orientation/hid-sensor-rotation.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/iio/orientation/hid-sensor-rotation.c b/drivers/iio/orientation/hid-sensor-rotation.c
index b98b9d94d184..a97e802ca523 100644
--- a/drivers/iio/orientation/hid-sensor-rotation.c
+++ b/drivers/iio/orientation/hid-sensor-rotation.c
@@ -335,6 +335,7 @@ static struct platform_driver hid_dev_rot_platform_driver = {
.id_table = hid_dev_rot_ids,
.driver = {
.name = KBUILD_MODNAME,
+ .pm = &hid_sensor_pm_ops,
},
.probe = hid_dev_rot_probe,
.remove = hid_dev_rot_remove,