staging: comedi: addi_apci_3120: merge in addi_apci_3001 driver

Browse source

The addi_apci_3120 and addi_apci_3001 drivers share the same low-level
board support code (hwdrv_apci3120). Merge the boardinfo and PCI_DEVICE
information from the addi_apci_3001 driver into the addi_apci_3120
driver and delete then delete the addi_apci_3001 driver.

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>

...

This commit is contained in:

H Hartley Sweeten 2012-11-01 17:24:06 -07:00 • committed by Greg Kroah-Hartman

parent 1180c883d8

commit 973781a821

4 changed files with 39 additions and 101 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

14

drivers/staging/comedi/Kconfig

View file

1

drivers/staging/comedi/drivers/Makefile

View file

88

drivers/staging/comedi/drivers/addi_apci_3001.c

View file

37

drivers/staging/comedi/drivers/addi_apci_3120.c

View file