]> git.karo-electronics.de Git - karo-tx-linux.git/commit
staging: comedi: addi_apci_1032: merge in hwdrv_apci1032.c
authorH Hartley Sweeten <hartleys@visionengravers.com>
Mon, 5 Nov 2012 21:40:50 +0000 (14:40 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 6 Nov 2012 08:30:57 +0000 (09:30 +0100)
commit6a3734af9aa8b036765b678b1b69b5672fa13679
tree42f3cd875d99bb63ec0c0f21deaf09d154b538ff
parent12d606f75422f4989a853c7c52b06a3b15ef59a2
staging: comedi: addi_apci_1032: merge in hwdrv_apci1032.c

Merge the remaining code from hwdrv_apci1032.c into the driver and
delete the now unused file.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c [deleted file]
drivers/staging/comedi/drivers/addi_apci_1032.c