Merge 3.8-rc5 into staging-next

[firefly-linux-kernel-4.4.55.git] / drivers / iio / light / hid-sensor-als.c

diff --git a/drivers/iio/light/hid-sensor-als.c b/drivers/iio/light/hid-sensor-als.c
index e2d042f2a544b0b55bcdbee9bf84e6ed5430a252..3d7e8c9b4beb15eb9cce8f3790ea136701a77c79 100644 (file)
--- a/drivers/iio/light/hid-sensor-als.c
+++ b/drivers/iio/light/hid-sensor-als.c
@@ -28,7 +28,6 @@
 #include <linux/iio/buffer.h>
 #include <linux/iio/trigger_consumer.h>
 #include <linux/iio/triggered_buffer.h>
-#include "../common/hid-sensors/hid-sensor-attributes.h"
 #include "../common/hid-sensors/hid-sensor-trigger.h"
 
 /*Format: HID-SENSOR-usage_id_in_hex*/
@@ -39,7 +38,7 @@
 
 struct als_state {
        struct hid_sensor_hub_callbacks callbacks;
-       struct hid_sensor_iio_common common_attributes;
+       struct hid_sensor_common common_attributes;
        struct hid_sensor_hub_attribute_info als_illum;
        u32 illum;
 };