]> git.karo-electronics.de Git - karo-tx-linux.git/commit
staging: comedi: addi_apci_3200: merge addi_apci_3300 support
authorH Hartley Sweeten <hartleys@visionengravers.com>
Tue, 6 Nov 2012 17:02:36 +0000 (10:02 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 13 Nov 2012 19:21:37 +0000 (11:21 -0800)
commit9741b0ac620211d86d04c83400b08622d84347cf
tree3d853fa8eab303389b25568efc736ef2e7165ee2
parent2b70a4f4f97b70e8cd9d8a16983758aa4fc3450b
staging: comedi: addi_apci_3200: merge addi_apci_3300 support

The addi_apci_3200 and addi_apci_3300 board share the same low-level
hardware code. Merge the drivers.

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/drivers/addi_apci_3200.c
drivers/staging/comedi/drivers/addi_apci_3300.c [deleted file]