Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b419769 authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman
Browse files

staging: comedi: ni_labpc: split common code to ni_labpc_common 



The "ni_labpc" module is a Comedi driver for the National Instruments
Lab-PC series of ISA data acquistion boards, and also provides common
code for the "ni_labpc_pci" and "ni_labpci_cs" modules (for PCI boards
and PCMCIA cards).

Split out the common code into a new module "ni_labpc_common", leaving
the driver for the ISA boards in the existing "ni_labpc" module.  This
removes the C preprocessor conditional directives from the resulting
".c" files (although they remain in the included header file
"ni_labpc_isadma.h").

Unneccessary `#include` directives have been removed from the resulting
".c" files.

Signed-off-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9439881a

drivers/staging/comedi/drivers/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ obj-$(CONFIG_COMEDI_NI_AT_A2150) += ni_at_a2150.o 
obj-$(CONFIG_COMEDI_NI_AT_AO)		+= ni_at_ao.o

obj-$(CONFIG_COMEDI_NI_ATMIO)		+= ni_atmio.o

obj-$(CONFIG_COMEDI_NI_ATMIO16D)	+= ni_atmio16d.o

obj-$(CONFIG_COMEDI_NI_LABPC_ISA)	+= ni_labpc.o

obj-$(CONFIG_COMEDI_PCMAD)		+= pcmad.o

obj-$(CONFIG_COMEDI_PCMDA12)		+= pcmda12.o

obj-$(CONFIG_COMEDI_PCMMIO)		+= pcmmio.o
@@ -135,7 +136,7 @@ obj-$(CONFIG_COMEDI_VMK80XX) += vmk80xx.o 
obj-$(CONFIG_COMEDI_MITE)		+= mite.o

obj-$(CONFIG_COMEDI_NI_TIO)		+= ni_tio.o

obj-$(CONFIG_COMEDI_NI_TIOCMD)		+= ni_tiocmd.o

obj-$(CONFIG_COMEDI_NI_LABPC)		+= ni_labpc.o

obj-$(CONFIG_COMEDI_NI_LABPC)		+= ni_labpc_common.o

obj-$(CONFIG_COMEDI_NI_LABPC_ISADMA)	+= ni_labpc_isadma.o



obj-$(CONFIG_COMEDI_8255)		+= 8255.o

drivers/staging/comedi/drivers/ni_labpc.c

+1 −1365

File changed.

Preview size limit exceeded, changes collapsed.

drivers/staging/comedi/drivers/ni_labpc_common.c

0 → 100644
+1387 −0

File added.

Preview size limit exceeded, changes collapsed.