Merge remote-tracking branch 'lsk/v3.10/topic/aosp' into linux-linaro-lsk-android

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

diff --git a/drivers/staging/comedi/Makefile b/drivers/staging/comedi/Makefile
index 51816c3fc268a93078f391319a957e5c52421934..e6dfc98f8c8ed8513740cea86ff7eda140ffca92 100644 (file)
--- a/drivers/staging/comedi/Makefile
+++ b/drivers/staging/comedi/Makefile
@@ -1,9 +1,12 @@
-comedi-y                       := comedi_fops.o range.o drivers.o \
-                                  comedi_buf.o
-comedi-$(CONFIG_PROC_FS)       += proc.o
-comedi-$(CONFIG_COMPAT)                += comedi_compat32.o
+comedi-y                               := comedi_fops.o range.o drivers.o \
+                                          comedi_buf.o
+comedi-$(CONFIG_COMEDI_PCI_DRIVERS)    += comedi_pci.o
+comedi-$(CONFIG_COMEDI_PCMCIA_DRIVERS) += comedi_pcmcia.o
+comedi-$(CONFIG_COMEDI_USB_DRIVERS)    += comedi_usb.o
+comedi-$(CONFIG_PROC_FS)               += proc.o
+comedi-$(CONFIG_COMPAT)                        += comedi_compat32.o
 
-obj-$(CONFIG_COMEDI)           += comedi.o
+obj-$(CONFIG_COMEDI)                   += comedi.o
 
-obj-$(CONFIG_COMEDI)           += kcomedilib/
-obj-$(CONFIG_COMEDI)           += drivers/
+obj-$(CONFIG_COMEDI)                   += kcomedilib/
+obj-$(CONFIG_COMEDI)                   += drivers/