From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Fri, 2 Nov 2012 00:24:06 +0000 (-0700)
Subject: staging: comedi: addi_apci_3120: merge in addi_apci_3001 driver
X-Git-Tag: omap-for-v3.8/fixes-for-merge-window-v4-signed~84^2~667
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=973781a821fe537ef1cb8ef227266faeed094ef6;p=pandora-kernel.git

staging: comedi: addi_apci_3120: merge in addi_apci_3001 driver

The addi_apci_3120 and addi_apci_3001 drivers share the same low-level
board support code (hwdrv_apci3120). Merge the boardinfo and PCI_DEVICE
information from the addi_apci_3001 driver into the addi_apci_3120
driver and delete then delete the addi_apci_3001 driver.

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