Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6

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

diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index 662aa3c71d0570b5f30407eceaa0ca905be54db4..5f03172cc0b5a5cd852f91135a5690aba8df7b0d 100644 (file)
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -45,3 +45,4 @@ obj-$(CONFIG_PCH_PHUB)                += pch_phub.o
 obj-y                          += ti-st/
 obj-$(CONFIG_AB8500_PWM)       += ab8500-pwm.o
 obj-y                          += lis3lv02d/
+obj-y                          += carma/