Merge 3.4-rc5 into staging-next

[pandora-kernel.git] / drivers / iio / inkern.c

diff --git a/drivers/staging/iio/inkern.c b/drivers/iio/inkern.c
similarity index 98%
rename from drivers/staging/iio/inkern.c
rename to drivers/iio/inkern.c
index ef07a02..9226458 100644 (file)
--- a/drivers/staging/iio/inkern.c
+++ b/drivers/iio/inkern.c
@@ -11,11 +11,11 @@
 #include <linux/slab.h>
 #include <linux/mutex.h>
 
-#include "iio.h"
+#include <linux/iio/iio.h>
 #include "iio_core.h"
-#include "machine.h"
-#include "driver.h"
-#include "consumer.h"
+#include <linux/iio/machine.h>
+#include <linux/iio/driver.h>
+#include <linux/iio/consumer.h>
 
 struct iio_map_internal {
        struct iio_dev *indio_dev;