Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[cascardo/linux.git] / drivers / scsi / megaraid.c

diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c
index 97825f1..76ad72d 100644 (file)
--- a/drivers/scsi/megaraid.c
+++ b/drivers/scsi/megaraid.c
@@ -305,12 +305,11 @@ mega_query_adapter(adapter_t *adapter)
 
        adapter->host->sg_tablesize = adapter->sglen;
 
-
        /* use HP firmware and bios version encoding
           Note: fw_version[0|1] and bios_version[0|1] were originally shifted
           right 8 bits making them zero. This 0 value was hardcoded to fix
           sparse warnings. */
-       if (adapter->product_info.subsysvid == HP_SUBSYS_VID) {
+       if (adapter->product_info.subsysvid == PCI_VENDOR_ID_HP) {
                sprintf (adapter->fw_version, "%c%d%d.%d%d",
                         adapter->product_info.fw_version[2],
                         0,
@@ -4716,7 +4715,7 @@ megaraid_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
         * support, since this firmware cannot handle 64 bit
         * addressing
         */
-       if ((subsysvid == HP_SUBSYS_VID) &&
+       if ((subsysvid == PCI_VENDOR_ID_HP) &&
            ((subsysid == 0x60E7) || (subsysid == 0x60E8))) {
                /*
                 * which firmware