Merge branch develop-3.10-next

[firefly-linux-kernel-4.4.55.git] / drivers / input / sensors / sensor-dev.c

diff --git a/drivers/input/sensors/sensor-dev.c b/drivers/input/sensors/sensor-dev.c
index b952f1797275a4d96412e88eb6153da5728b5487..d7536fc421f75aa2766bfaa3ea4988939a573b18 100755 (executable)
--- a/drivers/input/sensors/sensor-dev.c
+++ b/drivers/input/sensors/sensor-dev.c
@@ -1456,6 +1456,9 @@ static int sensor_misc_device_register(struct sensor_private_data *sensor, int t
                        {\r
                                sensor->fops.owner = THIS_MODULE;\r
                                sensor->fops.unlocked_ioctl = gsensor_dev_ioctl;\r
+                #ifdef CONFIG_COMPAT\r
+                               sensor->fops.compat_ioctl = gsensor_dev_ioctl;\r
+                               #endif\r
                                sensor->fops.open = gsensor_dev_open;\r
                                sensor->fops.release = gsensor_dev_release;\r
 \r
@@ -2099,6 +2102,7 @@ static const struct i2c_device_id sensor_id[] = {
        {"gs_lsm303d", ACCEL_ID_LSM303D},\r
        {"gs_mc3230",ACCEL_ID_MC3230},\r
        {"mpu6880_acc",ACCEL_ID_MPU6880},\r
+       {"mpu6500_acc",ACCEL_ID_MPU6500},\r
        /*compass*/\r
        {"compass", COMPASS_ID_ALL},\r
        {"ak8975", COMPASS_ID_AK8975},  \r