diff options
| author |   H Hartley Sweeten <hartleys@visionengravers.com> | 2012-09-12 15:37:14 -0700 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-13 20:11:13 -0700 |
| commit | 41518de2e1cdb27a6c4af4770435466322f065be (patch) | |
| tree | 325c2a9246dc954788f6982d164ba6ceb88ee289 | |
| parent | staging: ipack/bridges/tpci200: Use endianess-aware types where applicable. (diff) | |
| download | linux-dev-41518de2e1cdb27a6c4af4770435466322f065be.tar.xz linux-dev-41518de2e1cdb27a6c4af4770435466322f065be.zip | |
staging: comedi: rename adl_pci7296 driver
This driver will be used for all generic PCI based 8255 digital
i/o boards. Rename the driver accordingly..
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>
| -rw-r--r-- | drivers/staging/comedi/Kconfig | 28 | ||||
| -rw-r--r-- | drivers/staging/comedi/drivers/8255_pci.c (renamed from drivers/staging/comedi/drivers/adl_pci7296.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/comedi/drivers/Makefile | 2 |
3 files changed, 16 insertions, 14 deletions
diff --git a/drivers/staging/comedi/Kconfig b/drivers/staging/comedi/Kconfig index d36486e51a9d..1ecf21397171 100644 --- a/drivers/staging/comedi/Kconfig +++ b/drivers/staging/comedi/Kconfig @@ -549,6 +549,19 @@ menuconfig COMEDI_PCI_DRIVERS if COMEDI_PCI_DRIVERS +config COMEDI_8255_PCI + tristate "Generic PCI based 8255 digital i/o board support" + select COMEDI_8255 + ---help--- + Enable support for PCI based 8255 digital i/o boards. This driver + provides a PCI wrapper around the generic 8255 driver. + + Supported boards: + ADlink - PCI-7224, PCI-7248, and PCI-7296 + + To compile this driver as a module, choose M here: the module will + be called 8255_pci. + config COMEDI_ADDI_APCI_035 tristate "ADDI-DATA APCI_035 support" depends on VIRT_TO_BUS @@ -687,17 +700,6 @@ config COMEDI_ADL_PCI7X3X To compile this driver as a module, choose M here: the module will be called adl_pci7x3x. -config COMEDI_ADL_PCI7296 - tristate "ADLink PCI-72xx opto-22 compatible digital i/o board support" - select COMEDI_8255 - ---help--- - Enable support for ADlink PCI-72xx opto-22 compatible digital i/o - boards. Supported boards include the 24-channel PCI-7224, 48-channel - PCI-7248, and 96-channel PCI-7296. - - To compile this driver as a module, choose M here: the module will be - called adl_pci7296. - config COMEDI_ADL_PCI8164 tristate "ADLink PCI-8164 4 Axes Motion Control board support" ---help--- @@ -1259,8 +1261,8 @@ config COMEDI_8255 that has an 8255 chip. For multifunction boards, the main driver will configure the 8255 subdevice automatically. - Note that most PCI 8255 boards do NOT work with this driver, and - need a separate driver as a wrapper. + Note that most PCI based 8255 boards use the 8255_pci driver as a + wrapper around this driver. To compile this driver as a module, choose M here: the module will be called 8255. diff --git a/drivers/staging/comedi/drivers/adl_pci7296.c b/drivers/staging/comedi/drivers/8255_pci.c index 96cfc9cd4a30..96cfc9cd4a30 100644 --- a/drivers/staging/comedi/drivers/adl_pci7296.c +++ b/drivers/staging/comedi/drivers/8255_pci.c diff --git a/drivers/staging/comedi/drivers/Makefile b/drivers/staging/comedi/drivers/Makefile index 849ea7fb0ab7..7798cdc59d1d 100644 --- a/drivers/staging/comedi/drivers/Makefile +++ b/drivers/staging/comedi/drivers/Makefile @@ -55,6 +55,7 @@ obj-$(CONFIG_COMEDI_MULTIQ3) += multiq3.o obj-$(CONFIG_COMEDI_POC) += poc.o # Comedi PCI drivers +obj-$(CONFIG_COMEDI_8255_PCI) += 8255_pci.o obj-$(CONFIG_COMEDI_ADDI_APCI_035) += addi_apci_035.o obj-$(CONFIG_COMEDI_ADDI_APCI_1032) += addi_apci_1032.o obj-$(CONFIG_COMEDI_ADDI_APCI_1500) += addi_apci_1500.o @@ -70,7 +71,6 @@ obj-$(CONFIG_COMEDI_ADDI_APCI_3501) += addi_apci_3501.o obj-$(CONFIG_COMEDI_ADDI_APCI_3XXX) += addi_apci_3xxx.o obj-$(CONFIG_COMEDI_ADL_PCI6208) += adl_pci6208.o obj-$(CONFIG_COMEDI_ADL_PCI7X3X) += adl_pci7x3x.o -obj-$(CONFIG_COMEDI_ADL_PCI7296) += adl_pci7296.o obj-$(CONFIG_COMEDI_ADL_PCI8164) += adl_pci8164.o obj-$(CONFIG_COMEDI_ADL_PCI9111) += adl_pci9111.o obj-$(CONFIG_COMEDI_ADL_PCI9118) += adl_pci9118.o |