From 84c9dc212ace974acf2ccfc5a97e83796c6385b2 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 14 Nov 2008 14:10:15 -0800 Subject: [PATCH] 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 Cc: Frank Mori Hess Cc: David Schleef Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/Kconfig | 14 ++++++++++++++ drivers/staging/comedi/Makefile | 1 + drivers/staging/comedi/drivers/Makefile | 2 ++ 3 files changed, 17 insertions(+) create mode 100644 drivers/staging/comedi/drivers/Makefile 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 +# -- 2.11.4.GIT