Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

[firefly-linux-kernel-4.4.55.git] / drivers / iio / Makefile

diff --git a/drivers/iio/Makefile b/drivers/iio/Makefile
index 6e43e5b8d4ed2ba2f138cf0f49a979c0536460dd..bcf7e9e3b053b0a1166626ee78c8830665cbc305 100644 (file)
--- a/drivers/iio/Makefile
+++ b/drivers/iio/Makefile
@@ -2,8 +2,6 @@
 # Makefile for the industrial I/O core.
 #
 
-ccflags-$(CONFIG_IIO_DEBUG) := -DDEBUG
-
 obj-$(CONFIG_IIO) += industrialio.o
 industrialio-y := industrialio-core.o industrialio-event.o inkern.o
 industrialio-$(CONFIG_IIO_BUFFER) += industrialio-buffer.o
@@ -23,5 +21,6 @@ obj-y += frequency/
 obj-y += imu/
 obj-y += light/
 obj-y += magnetometer/
-obj-y += trigger/
 obj-y += pressure/
+obj-y += temperature/
+obj-y += trigger/