From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Tue, 6 Nov 2012 17:02:36 +0000 (-0700)
Subject: staging: comedi: addi_apci_3200: merge addi_apci_3300 support
X-Git-Tag: omap-for-v3.8/fixes-for-merge-window-v4-signed~84^2~561
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9741b0ac620211d86d04c83400b08622d84347cf;p=pandora-kernel.git

staging: comedi: addi_apci_3200: merge addi_apci_3300 support

The addi_apci_3200 and addi_apci_3300 board share the same low-level
hardware code. Merge the drivers.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

Reading git-diff-tree failed