--- zzzz-none-000/linux-2.6.19.2/drivers/scsi/qla2xxx/qla_init.c	2007-01-10 19:10:37.000000000 +0000
+++ davinci-8020-5504/linux-2.6.19.2/drivers/scsi/qla2xxx/qla_init.c	2007-01-11 07:38:19.000000000 +0000
@@ -1644,7 +1644,7 @@
 	 * Set host adapter parameters.
 	 */
 	if (nv->host_p[0] & BIT_7)
-		ql2xextended_error_logging = 1;
+		qla2_extended_error_logging = 1;
 	ha->flags.disable_risc_code_load = ((nv->host_p[0] & BIT_4) ? 1 : 0);
 	/* Always load RISC code on non ISP2[12]00 chips. */
 	if (!IS_QLA2100(ha) && !IS_QLA2200(ha))
@@ -3948,24 +3948,3 @@
 fail_fw_integrity:
 	return QLA_FUNCTION_FAILED;
 }
-
-void
-qla2x00_try_to_stop_firmware(scsi_qla_host_t *ha)
-{
-	int ret, retries;
-
-	if (!IS_QLA24XX(ha) && !IS_QLA54XX(ha))
-		return;
-
-	ret = qla2x00_stop_firmware(ha);
-	for (retries = 5; ret != QLA_SUCCESS && retries ; retries--) {
-		qla2x00_reset_chip(ha);
-		if (qla2x00_chip_diag(ha) != QLA_SUCCESS)
-			continue;
-		if (qla2x00_setup_chip(ha) != QLA_SUCCESS)
-			continue;
-		qla_printk(KERN_INFO, ha,
-		    "Attempting retry of stop-firmware command...\n");
-		ret = qla2x00_stop_firmware(ha);
-	}
-}