diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-01-30 15:22:21 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-31 10:38:10 +0100 |
| commit | 33782dd5edf8db3cdb7c81a3523bf743dd0209b7 (patch) | |
| tree | 952a325b3dd1b619def75a58caaf17cc83ba4b57 /drivers/staging/comedi/Makefile | |
| parent | abac8b54a353b9a1ac7d09ff790812655f618896 (diff) | |
staging: comedi: conditionally build in PCI driver support
Separate the comedi_pci_* functions out of drivers.c into a new
source file, comedi_pci.c. This allows conditionally building
support for comedi PCI drivers into the comedi core. Fix the
Kconfig and Makefile appropriately.
Group all the comedi_pci_* prototypes and related defines into one
place in comedidev.h. Protect these prototypes with an #ifdef and
provide some dummy functions so that the mixed ISA/PCI comedi
drivers will still build correctly.
Remove the #include <linux/pci.h> from comedidev.h and drivers.c. This
include is only needed by the comedi PCI driver support code and the
PCI drivers. The include should occur in those files.
Also, remove the #include <linux/pci.h> from a couple non-PCI drivers
since it's not needed.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi/Makefile')
| -rw-r--r-- | drivers/staging/comedi/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/staging/comedi/Makefile b/drivers/staging/comedi/Makefile index 872a87b9642e..5372cb1adb5c 100644 --- a/drivers/staging/comedi/Makefile +++ b/drivers/staging/comedi/Makefile @@ -1,5 +1,6 @@ comedi-y := comedi_fops.o range.o drivers.o \ comedi_buf.o +comedi-$(CONFIG_COMEDI_PCI_DRIVERS) += comedi_pci.o comedi-$(CONFIG_COMEDI_USB_DRIVERS) += comedi_usb.o comedi-$(CONFIG_PROC_FS) += proc.o comedi-$(CONFIG_COMPAT) += comedi_compat32.o |