Remove all inclusions of <linux/config.h>

[pandora-kernel.git] / drivers / scsi / aic94xx / aic94xx_init.c

diff --git a/drivers/scsi/aic94xx/aic94xx_init.c b/drivers/scsi/aic94xx/aic94xx_init.c
index 3ec2e46..734adc9 100644 (file)
--- a/drivers/scsi/aic94xx/aic94xx_init.c
+++ b/drivers/scsi/aic94xx/aic94xx_init.c
@@ -24,7 +24,6 @@
  *
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
@@ -240,10 +239,14 @@ static int __devinit asd_common_setup(struct asd_ha_struct *asd_ha)
        /* All phys are enabled, by default. */
        asd_ha->hw_prof.enabled_phys = 0xFF;
        for (i = 0; i < ASD_MAX_PHYS; i++) {
-               asd_ha->hw_prof.phy_desc[i].max_sas_lrate = PHY_LINKRATE_3;
-               asd_ha->hw_prof.phy_desc[i].min_sas_lrate = PHY_LINKRATE_1_5;
-               asd_ha->hw_prof.phy_desc[i].max_sata_lrate= PHY_LINKRATE_1_5;
-               asd_ha->hw_prof.phy_desc[i].min_sata_lrate= PHY_LINKRATE_1_5;
+               asd_ha->hw_prof.phy_desc[i].max_sas_lrate =
+                       SAS_LINK_RATE_3_0_GBPS;
+               asd_ha->hw_prof.phy_desc[i].min_sas_lrate =
+                       SAS_LINK_RATE_1_5_GBPS;
+               asd_ha->hw_prof.phy_desc[i].max_sata_lrate =
+                       SAS_LINK_RATE_1_5_GBPS;
+               asd_ha->hw_prof.phy_desc[i].min_sata_lrate =
+                       SAS_LINK_RATE_1_5_GBPS;
        }
 
        return 0;
@@ -620,6 +623,8 @@ static int __devinit asd_pci_probe(struct pci_dev *dev,
                   asd_ha->hw_prof.bios.present ? "build " : "not present",
                   asd_ha->hw_prof.bios.bld);
 
+       shost->can_queue = asd_ha->seq.can_queue;
+
        if (use_msi)
                pci_enable_msi(asd_ha->pcidev);
 
@@ -822,7 +827,7 @@ static int __init aic94xx_init(void)
 
        aic94xx_transport_template =
                sas_domain_attach_transport(&aic94xx_transport_functions);
-       if (err)
+       if (!aic94xx_transport_template)
                goto out_destroy_caches;
 
        err = pci_register_driver(&aic94xx_pci_driver);