From: Ian Abbott Date: Fri, 12 Apr 2013 14:01:10 +0000 (+0100) Subject: staging: comedi: addi_apci_*: replace ADDIDATA_OLD with AMCC X-Git-Tag: omap-for-v3.10/dt-fixes-for-merge-window~137^2~71 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aee351b28ccc7b966a14c8a8e146c6b74d4717cc;p=pandora-kernel.git staging: comedi: addi_apci_*: replace ADDIDATA_OLD with AMCC PCI vendor ID 0x10e8 is assigned to Applied Micro Circuits Corporation (recently AppliedMicro, but AMCC on NASDAQ). The ID currently appears as `PCI_VENDOR_ID_ADDIDATA_OLD` in "include/linux/pci_ids.h" and is used by the "addi_apci_1500", "addi_apci_1710" and "addi_apci_3120" comedi drivers. (It is also used by the "8250_pci" serial driver.) "comedidev.h" defines `PCI_VENDOR_ID_AMCC` locally with the same value as `PCI_VENDOR_ID_ADDIDATA_OLD` and is currently used by the "adl_pci9118" comedi driver. Despite `PCI_VENDOR_ID_ADDIDATA_OLD` being in "pci_ids.h", `PCI_VENDOR_ID_AMCC` is a more sensible name, so change the comedi drivers to use it. Once several drivers are using `PCI_VENDOR_ID_AMCC` we'll have a good excuse to move it into "pci_ids.h" and change the "8250_pci" serial driver to use it. Signed-off-by: Ian Abbott Reviewed-by: H Hartley Sweeten Signed-off-by: Greg Kroah-Hartman --- Reading git-diff-tree failed