···11111212#include <linux/ioctl.h>1313#include <linux/types.h>1414-#include "types.h"1414+#include <linux/iio/types.h>15151616/**1717 * struct iio_event_data - The actual event being pushed to userspace
···12121313#include <linux/device.h>1414#include <linux/cdev.h>1515-#include "types.h"1515+#include <linux/iio/types.h>1616/* IIO TODO LIST */1717/*1818 * Provide means of adjusting timer accuracy.
+2-2
drivers/staging/iio/iio_dummy_evgen.c
···2222#include <linux/sysfs.h>23232424#include "iio_dummy_evgen.h"2525-#include "iio.h"2626-#include "sysfs.h"2525+#include <linux/iio/iio.h>2626+#include <linux/iio/sysfs.h>27272828/* Fiddly bit of faking and irq without hardware */2929#define IIO_EVENTGEN_NO 10
···2323#include <linux/slab.h>2424#include <linux/anon_inodes.h>2525#include <linux/debugfs.h>2626-#include "iio.h"2626+#include <linux/iio/iio.h>2727#include "iio_core.h"2828#include "iio_core_trigger.h"2929-#include "sysfs.h"3030-#include "events.h"2929+#include <linux/iio/sysfs.h>3030+#include <linux/iio/events.h>31313232/* IDA to assign each registered device a unique id*/3333static DEFINE_IDA(iio_ida);
+3-3
drivers/staging/iio/industrialio-event.c
···2020#include <linux/slab.h>2121#include <linux/uaccess.h>2222#include <linux/wait.h>2323-#include "iio.h"2323+#include <linux/iio/iio.h>2424#include "iio_core.h"2525-#include "sysfs.h"2626-#include "events.h"2525+#include <linux/iio/sysfs.h>2626+#include <linux/iio/events.h>27272828/**2929 * struct iio_event_interface - chrdev interface for an event line
+3-3
drivers/staging/iio/industrialio-trigger.c
···1515#include <linux/list.h>1616#include <linux/slab.h>17171818-#include "iio.h"1919-#include "trigger.h"1818+#include <linux/iio/iio.h>1919+#include <linux/iio/trigger.h>2020#include "iio_core.h"2121#include "iio_core_trigger.h"2222-#include "trigger_consumer.h"2222+#include <linux/iio/trigger_consumer.h>23232424/* RFC - Question of approach2525 * Make the common case (single sensor single trigger)
···3535#include <linux/err.h>3636#include <linux/slab.h>37373838-#include "../iio.h"3939-#include "../sysfs.h"4040-#include "../events.h"3838+#include <linux/iio/iio.h>3939+#include <linux/iio/sysfs.h>4040+#include <linux/iio/events.h>4141#include "tsl2563.h"42424343/* Use this many bits for fraction part. */
···30303131#include <linux/gpio.h>32323333-#include "../iio.h"3434-#include "../sysfs.h"3333+#include <linux/iio/iio.h>3434+#include <linux/iio/sysfs.h>3535/*3636 * Register definitions, as well as various shifts and masks to get at the3737 * individual fields of the registers.