Staging: comedi: set up infrastructure for individual drivers

This adds two "generic" Kconfig options, one for PCI and one for USB
comedi drivers, and the Makefile infrastructure as well.  This is so
we can start adding individual comedi drivers and add them to the build
properly.

Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Cc: David Schleef <ds@schleef.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/comedi/Kconfig b/drivers/staging/comedi/Kconfig
index 1d5e7ccba1f9958ccd5f5a87e24700d60bbb48bd..b501bfb9c7548139b7de560a93d9497a3cfa8a90 100644 (file)
--- a/drivers/staging/comedi/Kconfig
+++ b/drivers/staging/comedi/Kconfig
@@ -11,3 +11,17 @@ config COMEDI_RT
        default N
        ---help---
          Enable Real time support for the Comedi core.
+
+config COMEDI_PCI_DRIVERS
+       tristate "Comedi PCI drivers"
+       depends on COMEDI && PCI
+       default N
+       ---help---
+         Enable lots of comedi PCI drivers to be built
+
+config COMEDI_USB_DRIVERS
+       tristate "Comedi USB drivers"
+       depends on COMEDI && USB
+       default N
+       ---help---
+         Enable lots of comedi USB drivers to be built

diff --git a/drivers/staging/comedi/Makefile b/drivers/staging/comedi/Makefile
index e91e8c7f2a889d18ddf70feeb4d580a37f37f9b0..afd1a19c1b87c48ab430a32106c8d3dd8d652ec2 100644 (file)
--- a/drivers/staging/comedi/Makefile
+++ b/drivers/staging/comedi/Makefile
@@ -2,6 +2,7 @@ obj-$(CONFIG_COMEDI) += comedi.o
 obj-$(CONFIG_COMEDI_RT) += comedi_rt.o
 
 obj-$(CONFIG_COMEDI)   += kcomedilib/
+obj-$(CONFIG_COMEDI)   += drivers/
 
 comedi-objs :=         \
        comedi_fops.o   \

diff --git a/drivers/staging/comedi/drivers/Makefile b/drivers/staging/comedi/drivers/Makefile
new file mode 100644 (file)
index 0000000..3c668a7
--- /dev/null
+++ b/drivers/staging/comedi/drivers/Makefile
@@ -0,0 +1,2 @@
+# Makefile for individual comedi drivers
+#