]> Pileus Git - ~andy/linux/commit
staging: comedi: addi_apci_1516: merge in hwdrv_apci1516.c
authorH Hartley Sweeten <hartleys@visionengravers.com>
Tue, 13 Nov 2012 20:44:53 +0000 (13:44 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 13 Nov 2012 23:12:54 +0000 (15:12 -0800)
commit87450c0271dd9da9242b13fa3ecade3af3d31eb9
tree967b3e8cf1b81e458def26e82d56e153b45c6fbf
parente32a32c9098c745048e28c2851ac356763d3bbba
staging: comedi: addi_apci_1516: merge in hwdrv_apci1516.c

Merge the code from hwdrv_apci1516.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_apci1516.c [deleted file]
drivers/staging/comedi/drivers/addi_apci_1516.c