From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Tue, 13 Nov 2012 20:44:53 +0000 (-0700)
Subject: staging: comedi: addi_apci_1516: merge in hwdrv_apci1516.c
X-Git-Tag: omap-for-v3.8/fixes-for-merge-window-v4-signed~84^2~405
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=87450c0271dd9da9242b13fa3ecade3af3d31eb9;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed