Merge master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-upstream into...

[powerpc.git] / drivers / scsi / aic94xx / aic94xx_seq.c

diff --git a/drivers/scsi/aic94xx/aic94xx_seq.c b/drivers/scsi/aic94xx/aic94xx_seq.c
index 9050c6f..56e4b3b 100644 (file)
--- a/drivers/scsi/aic94xx/aic94xx_seq.c
+++ b/drivers/scsi/aic94xx/aic94xx_seq.c
@@ -28,6 +28,7 @@
 
 #include <linux/delay.h>
 #include <linux/pci.h>
+#include <linux/module.h>
 #include <linux/firmware.h>
 #include "aic94xx_reg.h"
 #include "aic94xx_hwi.h"
@@ -763,7 +764,7 @@ static void asd_init_lseq_mdp(struct asd_ha_struct *asd_ha,  int lseq)
        asd_write_reg_word(asd_ha, LmSEQ_FIRST_INV_SCB_SITE(lseq),
                           (u16)last_scb_site_no+1);
        asd_write_reg_word(asd_ha, LmSEQ_INTEN_SAVE(lseq),
-                           (u16) LmM0INTEN_MASK & 0xFFFF0000 >> 16);
+                           (u16) ((LmM0INTEN_MASK & 0xFFFF0000) >> 16));
        asd_write_reg_word(asd_ha, LmSEQ_INTEN_SAVE(lseq) + 2,
                            (u16) LmM0INTEN_MASK & 0xFFFF);
        asd_write_reg_byte(asd_ha, LmSEQ_LINK_RST_FRM_LEN(lseq), 0);
@@ -1399,3 +1400,5 @@ void asd_update_port_links(struct asd_sas_phy *sas_phy)
        if (err)
                asd_printk("couldn't update DDB 0:error:%d\n", err);
 }
+
+MODULE_FIRMWARE(SAS_RAZOR_SEQUENCER_FW_FILE);