Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

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

diff --git a/drivers/iio/Makefile b/drivers/iio/Makefile
index 887d39090d7568391d059bdf9f30902a6123cd25..698afc2d17ce84c62e8e7fea4473558505d11808 100644 (file)
--- a/drivers/iio/Makefile
+++ b/drivers/iio/Makefile
@@ -24,5 +24,6 @@ obj-y += light/
 obj-y += magnetometer/
 obj-y += orientation/
 obj-y += pressure/
+obj-y += proximity/
 obj-y += temperature/
 obj-y += trigger/