Merge ../scsi-misc-2.6

Conflicts:

	drivers/scsi/nsp32.c
	drivers/scsi/pcmcia/nsp_cs.c

Removal of randomness flag conflicts with SA_ -> IRQF_ global
replacement.

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 2 insertions, 3 deletions

diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index 5a28d9bf8e4d..81755a3f7c68 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -939,12 +939,12 @@ lpfc_get_hba_model_desc(struct lpfc_hba * phba, uint8_t * mdp, uint8_t * descp)
                                         "10-port ", "PCIe"};
                         break;
                 default:
-                        m = (typeof(m)){ 0 };
+                        m = (typeof(m)){ NULL };
                         break;
                 }
                 break;
         default:
-                m = (typeof(m)){ 0 };
+                m = (typeof(m)){ NULL };
                 break;
         }
 
@@ -1451,7 +1451,6 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)
                 goto out_put_host;
 
         host->unique_id = phba->brd_no;
-        init_MUTEX(&phba->hba_can_block);
         INIT_LIST_HEAD(&phba->ctrspbuflist);
         INIT_LIST_HEAD(&phba->rnidrspbuflist);
         INIT_LIST_HEAD(&phba->freebufList);