diff options
| author | H Hartley Sweeten <hartleys@visionengravers.com> | 2012-11-01 17:24:06 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-02 11:23:47 -0700 |
| commit | 973781a821fe537ef1cb8ef227266faeed094ef6 (patch) | |
| tree | c962553b6a6b66694fdc66d6108d5274926cbefd /include/linux | |
| parent | 1180c883d868f8ac04fff2a21889e9b2c138a4d3 (diff) | |
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>
Diffstat (limited to 'include/linux')
0 files changed, 0 insertions, 0 deletions