aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2008-11-14 14:10:15 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2009-01-06 13:52:17 -0800
commit84c9dc212ace974acf2ccfc5a97e83796c6385b2 (patch)
treed75c6d978d2d97a30b97e5d5161d31f3665396e2
parentb79a7a2089294cba254f6972e4e224fea643b84a (diff)
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>
-rw-r--r--drivers/staging/comedi/Kconfig14
-rw-r--r--drivers/staging/comedi/Makefile1
-rw-r--r--drivers/staging/comedi/drivers/Makefile2
3 files changed, 17 insertions, 0 deletions
diff --git a/drivers/staging/comedi/Kconfig b/drivers/staging/comedi/Kconfig
index 1d5e7ccba1f..b501bfb9c75 100644
--- 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 e91e8c7f2a8..afd1a19c1b8 100644
--- 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
index 00000000000..3c668a7f419
--- /dev/null
+++ b/drivers/staging/comedi/drivers/Makefile
@@ -0,0 +1,2 @@
+# Makefile for individual comedi drivers
+#