projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 1180c88) | patch
staging: comedi: addi_apci_3120: merge in addi_apci_3001 driver
authorH Hartley Sweeten <hartleys@visionengravers.com>
Fri, 2 Nov 2012 00:24:06 +0000 (17:24 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 2 Nov 2012 18:23:47 +0000 (11:23 -0700)
commit973781a821fe537ef1cb8ef227266faeed094ef6
treec962553b6a6b66694fdc66d6108d5274926cbefdtree | snapshot
parent1180c883d868f8ac04fff2a21889e9b2c138a4d3commit | diff
staging: comedi: addi_apci_3120: merge in addi_apci_3001 driver

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>
drivers/staging/comedi/Kconfig diff | blob | history
drivers/staging/comedi/drivers/Makefile diff | blob | history
drivers/staging/comedi/drivers/addi_apci_3001.c [deleted file] blob | history
drivers/staging/comedi/drivers/addi_apci_3120.c diff | blob | history
Linux Kernel tree with some unpolished code for Colibri/Apalis modules