From: H Hartley Sweeten Date: Fri, 30 Nov 2012 01:18:51 +0000 (-0700) Subject: staging: comedi: addi_apci_2032: merge in hwdrv_apci2032.c X-Git-Tag: omap-for-v3.8/fixes-for-merge-window-v4-signed~84^2~12 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d02178b7fb1f2545ebe1004dc8f1f4436a9d37c1;p=pandora-kernel.git 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 Cc: Ian Abbott Cc: Greg Kroah-Hartman Signed-off-by: Greg Kroah-Hartman --- Reading git-diff-tree failed