aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging/iio/light
diff options
context:
space:
mode:
authorJonathan Cameron <jic23@kernel.org>2012-04-25 15:54:58 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-04-25 11:01:43 -0700
commit06458e277eac2b8761b0a04d3c808d57be281a2e (patch)
treecba55bcbdd101a3ab84bfe27fccdb9efd18d757e /drivers/staging/iio/light
parent68284a12923f9f8f2741efca10c045e179f2e753 (diff)
IIO: Move core headers to include/linux/iio
Step 1 in moving the IIO core out of staging. Signed-off-by: Jonathan Cameron <jic23@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/iio/light')
-rw-r--r--drivers/staging/iio/light/isl29018.c4
-rw-r--r--drivers/staging/iio/light/isl29028.c4
-rw-r--r--drivers/staging/iio/light/tsl2563.c6
-rw-r--r--drivers/staging/iio/light/tsl2583.c2
-rwxr-xr-xdrivers/staging/iio/light/tsl2x7x_core.c6
5 files changed, 11 insertions, 11 deletions
diff --git a/drivers/staging/iio/light/isl29018.c b/drivers/staging/iio/light/isl29018.c
index 2c894a6f7881..92283ebafa55 100644
--- a/drivers/staging/iio/light/isl29018.c
+++ b/drivers/staging/iio/light/isl29018.c
@@ -28,8 +28,8 @@
#include <linux/delay.h>
#include <linux/regmap.h>
#include <linux/slab.h>
-#include "../iio.h"
-#include "../sysfs.h"
+#include <linux/iio/iio.h>
+#include <linux/iio/sysfs.h>
#define CONVERSION_TIME_MS 100
diff --git a/drivers/staging/iio/light/isl29028.c b/drivers/staging/iio/light/isl29028.c
index 7057d9b56624..2ada20e65f22 100644
--- a/drivers/staging/iio/light/isl29028.c
+++ b/drivers/staging/iio/light/isl29028.c
@@ -24,8 +24,8 @@
#include <linux/delay.h>
#include <linux/slab.h>
#include <linux/regmap.h>
-#include "../iio.h"
-#include "../sysfs.h"
+#include <linux/iio/iio.h>
+#include <linux/iio/sysfs.h>
#define CONVERSION_TIME_MS 100
diff --git a/drivers/staging/iio/light/tsl2563.c b/drivers/staging/iio/light/tsl2563.c
index a1e5cbeb25ac..635136004103 100644
--- a/drivers/staging/iio/light/tsl2563.c
+++ b/drivers/staging/iio/light/tsl2563.c
@@ -35,9 +35,9 @@
#include <linux/err.h>
#include <linux/slab.h>
-#include "../iio.h"
-#include "../sysfs.h"
-#include "../events.h"
+#include <linux/iio/iio.h>
+#include <linux/iio/sysfs.h>
+#include <linux/iio/events.h>
#include "tsl2563.h"
/* Use this many bits for fraction part. */
diff --git a/drivers/staging/iio/light/tsl2583.c b/drivers/staging/iio/light/tsl2583.c
index 8671d98e0448..51b636241d97 100644
--- a/drivers/staging/iio/light/tsl2583.c
+++ b/drivers/staging/iio/light/tsl2583.c
@@ -28,7 +28,7 @@
#include <linux/unistd.h>
#include <linux/slab.h>
#include <linux/module.h>
-#include "../iio.h"
+#include <linux/iio/iio.h>
#define TSL258X_MAX_DEVICE_REGS 32
diff --git a/drivers/staging/iio/light/tsl2x7x_core.c b/drivers/staging/iio/light/tsl2x7x_core.c
index f3fc85a22b1a..dfc3da6e92e9 100755
--- a/drivers/staging/iio/light/tsl2x7x_core.c
+++ b/drivers/staging/iio/light/tsl2x7x_core.c
@@ -28,10 +28,10 @@
#include <linux/slab.h>
#include <linux/module.h>
#include <linux/version.h>
+#include <linux/iio/events.h>
+#include <linux/iio/iio.h>
+#include <linux/iio/sysfs.h>
#include "tsl2x7x.h"
-#include "../events.h"
-#include "../iio.h"
-#include "../sysfs.h"
/* Cal defs*/
#define PROX_STAT_CAL 0