summaryrefslogtreecommitdiffstats
path: root/drivers/iio
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-29 08:37:12 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-29 08:37:12 -0700
commitcb1f6268acd7f1bca7153fa9ca187ffb73f60ab8 (patch)
tree28695d8b8cbc1876e2e60880f45a502a7ded043d /drivers/iio
parentd9ff3934171b5cf1ac17e5fcd39f3f324b4724ce (diff)
parent8f0d8163b50e01f398b14bcd4dc039ac5ab18d64 (diff)
downloadlinux-stable-cb1f6268acd7f1bca7153fa9ca187ffb73f60ab8.tar.gz
linux-stable-cb1f6268acd7f1bca7153fa9ca187ffb73f60ab8.tar.bz2
linux-stable-cb1f6268acd7f1bca7153fa9ca187ffb73f60ab8.zip
Merge 3.7-rc3 into staging-next
This resolves the conflict with: drivers/staging/comedi/drivers/amplc_dio200.c and syncs up the changes that happened in the staging directory for 3.7-rc3. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/iio')
-rw-r--r--drivers/iio/Kconfig1
-rw-r--r--drivers/iio/Makefile1
2 files changed, 0 insertions, 2 deletions
diff --git a/drivers/iio/Kconfig b/drivers/iio/Kconfig
index 6e3f143fc71d..fc937aca71fb 100644
--- a/drivers/iio/Kconfig
+++ b/drivers/iio/Kconfig
@@ -62,7 +62,6 @@ source "drivers/iio/frequency/Kconfig"
source "drivers/iio/dac/Kconfig"
source "drivers/iio/common/Kconfig"
source "drivers/iio/gyro/Kconfig"
-source "drivers/iio/light/Kconfig"
source "drivers/iio/magnetometer/Kconfig"
endif # IIO
diff --git a/drivers/iio/Makefile b/drivers/iio/Makefile
index f7fa3c0867b4..761f2b65ac52 100644
--- a/drivers/iio/Makefile
+++ b/drivers/iio/Makefile
@@ -18,5 +18,4 @@ obj-y += frequency/
obj-y += dac/
obj-y += common/
obj-y += gyro/
-obj-y += light/
obj-y += magnetometer/