From d436b1b8c0ecbb8c0991ab68627655b2a6d00667 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 20 Nov 2008 14:51:03 -0800 Subject: [PATCH] fix review-2.6.27/scsi-qla2xxx-correct-atmel-flash-part-handling.patch to build properly --- ...a2xxx-correct-atmel-flash-part-handling.patch | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/review-2.6.27/scsi-qla2xxx-correct-atmel-flash-part-handling.patch b/review-2.6.27/scsi-qla2xxx-correct-atmel-flash-part-handling.patch index ec39235aee8..92211e604d8 100644 --- a/review-2.6.27/scsi-qla2xxx-correct-atmel-flash-part-handling.patch +++ b/review-2.6.27/scsi-qla2xxx-correct-atmel-flash-part-handling.patch @@ -17,8 +17,8 @@ Signed-off-by: Greg Kroah-Hartman --- drivers/scsi/qla2xxx/qla_def.h | 1 - - drivers/scsi/qla2xxx/qla_sup.c | 19 +++++++------------ - 2 files changed, 7 insertions(+), 13 deletions(-) + drivers/scsi/qla2xxx/qla_sup.c | 23 +++++++++-------------- + 2 files changed, 9 insertions(+), 15 deletions(-) --- a/drivers/scsi/qla2xxx/qla_def.h +++ b/drivers/scsi/qla2xxx/qla_def.h @@ -71,6 +71,18 @@ Signed-off-by: Greg Kroah-Hartman ha->fdt_erase_cmd = flash_conf_to_access_addr(0x0320); ha->fdt_unprotect_sec_cmd = flash_conf_to_access_addr(0x0339); ha->fdt_protect_sec_cmd = flash_conf_to_access_addr(0x0336); +@@ -627,9 +626,9 @@ no_flash_data: + } + + DEBUG2(qla_printk(KERN_DEBUG, ha, "Flash[MID]: (0x%x/0x%x) erase=0x%x " +- "pro=%x upro=%x idx=%d wrtd=0x%x blk=0x%x.\n", man_id, flash_id, ++ "pro=%x upro=%x wrtd=0x%x blk=0x%x.\n", man_id, flash_id, + ha->fdt_erase_cmd, ha->fdt_protect_sec_cmd, +- ha->fdt_unprotect_sec_cmd, ha->fdt_odd_index, ha->fdt_wrt_disable, ++ ha->fdt_unprotect_sec_cmd, ha->fdt_wrt_disable, + ha->fdt_block_size)); + } + @@ -710,13 +709,9 @@ qla24xx_write_flash_data(scsi_qla_host_t qla24xx_unprotect_flash(ha); -- 2.47.3