diff options
author | Jonathan Cameron <jic23@cam.ac.uk> | 2011-08-30 07:41:15 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-09-06 19:00:28 -0400 |
commit | 9dd1cb303c18f4508abc69f5b40f423ff36a9626 (patch) | |
tree | 81bc2153a52d767d1c121cfc55b125aae96f2705 | |
parent | c009f7e42617bd52b61a35de621cd1deda08042b (diff) |
staging:iio: push "sysfs.h" and linux/irq.h out of iio.h
These are no longer needed.
Requires a few driver updates for places "sysfs.h" should have been
present but wasn't.
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/staging/iio/dac/max517.c | 1 | ||||
-rw-r--r-- | drivers/staging/iio/iio.h | 2 | ||||
-rw-r--r-- | drivers/staging/iio/industrialio-core.c | 2 | ||||
-rw-r--r-- | drivers/staging/iio/industrialio-ring.c | 1 | ||||
-rw-r--r-- | drivers/staging/iio/light/isl29018.c | 2 | ||||
-rw-r--r-- | drivers/staging/iio/light/tsl2563.c | 1 | ||||
-rw-r--r-- | drivers/staging/iio/magnetometer/ak8975.c | 2 |
7 files changed, 7 insertions, 4 deletions
diff --git a/drivers/staging/iio/dac/max517.c b/drivers/staging/iio/dac/max517.c index ed5d351b238..d54262ff0cd 100644 --- a/drivers/staging/iio/dac/max517.c +++ b/drivers/staging/iio/dac/max517.c | |||
@@ -26,6 +26,7 @@ | |||
26 | #include <linux/err.h> | 26 | #include <linux/err.h> |
27 | 27 | ||
28 | #include "../iio.h" | 28 | #include "../iio.h" |
29 | #include "../sysfs.h" | ||
29 | #include "dac.h" | 30 | #include "dac.h" |
30 | 31 | ||
31 | #include "max517.h" | 32 | #include "max517.h" |
diff --git a/drivers/staging/iio/iio.h b/drivers/staging/iio/iio.h index 36a826e6e65..6b896a511de 100644 --- a/drivers/staging/iio/iio.h +++ b/drivers/staging/iio/iio.h | |||
@@ -13,8 +13,6 @@ | |||
13 | 13 | ||
14 | #include <linux/device.h> | 14 | #include <linux/device.h> |
15 | #include <linux/cdev.h> | 15 | #include <linux/cdev.h> |
16 | #include <linux/irq.h> | ||
17 | #include "sysfs.h" | ||
18 | 16 | ||
19 | /* IIO TODO LIST */ | 17 | /* IIO TODO LIST */ |
20 | /* | 18 | /* |
diff --git a/drivers/staging/iio/industrialio-core.c b/drivers/staging/iio/industrialio-core.c index e83d62609ec..f59a603713c 100644 --- a/drivers/staging/iio/industrialio-core.c +++ b/drivers/staging/iio/industrialio-core.c | |||
@@ -26,6 +26,8 @@ | |||
26 | #include "iio_core.h" | 26 | #include "iio_core.h" |
27 | #include "iio_core_trigger.h" | 27 | #include "iio_core_trigger.h" |
28 | #include "chrdev.h" | 28 | #include "chrdev.h" |
29 | #include "sysfs.h" | ||
30 | |||
29 | /* IDA to assign each registered device a unique id*/ | 31 | /* IDA to assign each registered device a unique id*/ |
30 | static DEFINE_IDA(iio_ida); | 32 | static DEFINE_IDA(iio_ida); |
31 | 33 | ||
diff --git a/drivers/staging/iio/industrialio-ring.c b/drivers/staging/iio/industrialio-ring.c index 947f5425ed7..e844246bc32 100644 --- a/drivers/staging/iio/industrialio-ring.c +++ b/drivers/staging/iio/industrialio-ring.c | |||
@@ -22,6 +22,7 @@ | |||
22 | 22 | ||
23 | #include "iio.h" | 23 | #include "iio.h" |
24 | #include "iio_core.h" | 24 | #include "iio_core.h" |
25 | #include "sysfs.h" | ||
25 | #include "ring_generic.h" | 26 | #include "ring_generic.h" |
26 | 27 | ||
27 | 28 | ||
diff --git a/drivers/staging/iio/light/isl29018.c b/drivers/staging/iio/light/isl29018.c index da5bb33a66c..f31e8c2fc5b 100644 --- a/drivers/staging/iio/light/isl29018.c +++ b/drivers/staging/iio/light/isl29018.c | |||
@@ -28,7 +28,7 @@ | |||
28 | #include <linux/delay.h> | 28 | #include <linux/delay.h> |
29 | #include <linux/slab.h> | 29 | #include <linux/slab.h> |
30 | #include "../iio.h" | 30 | #include "../iio.h" |
31 | 31 | #include "../sysfs.h" | |
32 | #define CONVERSION_TIME_MS 100 | 32 | #define CONVERSION_TIME_MS 100 |
33 | 33 | ||
34 | #define ISL29018_REG_ADD_COMMAND1 0x00 | 34 | #define ISL29018_REG_ADD_COMMAND1 0x00 |
diff --git a/drivers/staging/iio/light/tsl2563.c b/drivers/staging/iio/light/tsl2563.c index 60d21f3f060..bd879ad836a 100644 --- a/drivers/staging/iio/light/tsl2563.c +++ b/drivers/staging/iio/light/tsl2563.c | |||
@@ -38,6 +38,7 @@ | |||
38 | #include <linux/slab.h> | 38 | #include <linux/slab.h> |
39 | 39 | ||
40 | #include "../iio.h" | 40 | #include "../iio.h" |
41 | #include "../sysfs.h" | ||
41 | #include "tsl2563.h" | 42 | #include "tsl2563.h" |
42 | 43 | ||
43 | /* Use this many bits for fraction part. */ | 44 | /* Use this many bits for fraction part. */ |
diff --git a/drivers/staging/iio/magnetometer/ak8975.c b/drivers/staging/iio/magnetometer/ak8975.c index a17fa9f6a30..43936cb4381 100644 --- a/drivers/staging/iio/magnetometer/ak8975.c +++ b/drivers/staging/iio/magnetometer/ak8975.c | |||
@@ -31,7 +31,7 @@ | |||
31 | #include <linux/gpio.h> | 31 | #include <linux/gpio.h> |
32 | 32 | ||
33 | #include "../iio.h" | 33 | #include "../iio.h" |
34 | 34 | #include "../sysfs.h" | |
35 | /* | 35 | /* |
36 | * Register definitions, as well as various shifts and masks to get at the | 36 | * Register definitions, as well as various shifts and masks to get at the |
37 | * individual fields of the registers. | 37 | * individual fields of the registers. |