From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 3 Oct 2012 02:40:48 +0000 (+1000)
Subject: Merge remote-tracking branch 'scsi/for-next'
X-Git-Tag: next-20121003~55
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=73c28a02fb1991e950d3f82ae00477ad7d4cd23f;p=karo-tx-linux.git

Merge remote-tracking branch 'scsi/for-next'

Conflicts:
	drivers/scsi/ipr.c
	drivers/scsi/qla2xxx/qla_nx.c
---

73c28a02fb1991e950d3f82ae00477ad7d4cd23f
diff --cc drivers/scsi/qla4xxx/ql4_nx.c
index 807bf76f1b6a,66f52d2b5cd4..499a92db1cf6
--- a/drivers/scsi/qla4xxx/ql4_nx.c
+++ b/drivers/scsi/qla4xxx/ql4_nx.c
@@@ -1564,8 -1638,9 +1638,8 @@@ qla4_8xxx_set_qsnt_ready(struct scsi_ql
  
  
  static int
- qla4_8xxx_start_firmware(struct scsi_qla_host *ha, uint32_t image_start)
+ qla4_82xx_start_firmware(struct scsi_qla_host *ha, uint32_t image_start)
  {
 -	int pcie_cap;
  	uint16_t lnk;
  
  	/* scrub dma mask expansion register */