fix review-2.6.27/scsi-qla2xxx-correct-atmel-flash-part-handling.patch to build properly

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 ec39235aee81cff85c06fde27c20d0c643fd4710..92211e604d81ef185d1ca86e5b0afa8f370cb8a0 100644 (file)
--- 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 <gregkh@suse.de>
 
 ---
  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 <gregkh@suse.de>
                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);