staging: comedi: addi_apci_2032: merge in hwdrv_apci2032.c
authorH Hartley Sweeten <hartleys@visionengravers.com>
Fri, 30 Nov 2012 01:18:51 +0000 (18:18 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 30 Nov 2012 02:05:30 +0000 (18:05 -0800)
commitd02178b7fb1f2545ebe1004dc8f1f4436a9d37c1
tree4c0beb4327cef1702d9f23b297c24adc3e4af420
parent61034e002d8ad10d2265d33168d1dc721375869f
staging: comedi: addi_apci_2032: merge in hwdrv_apci2032.c

Merge the code from hwdrv_apci2032.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_apci2032.c [deleted file]
drivers/staging/comedi/drivers/addi_apci_2032.c