--- drivers/scsi/scsi_scan.c.orig	2005-06-30 04:30:53.000000000 +0530
+++ drivers/scsi/scsi_scan.c	2005-07-12 16:19:48.533788528 +0530
@@ -1170,6 +1170,7 @@
 				       " aborted\n", devname, lun);
 				break;
 			}
+                        memcpy(sdev->lun_address, lunp, sizeof(sdev->lun_address));
 		}
 	}
 
--- include/scsi/scsi_device.h.orig	2005-06-30 04:30:53.000000000 +0530
+++ include/scsi/scsi_device.h	2005-07-12 16:19:48.534788376 +0530
@@ -58,6 +58,8 @@
 					   could all be from the same event. */
 
 	unsigned int id, lun, channel;
+        struct scsi_lun lun_address;    /* scsi address returned by REPORT_LUNS
+                                         * usable only if sdev->scsi_lun >= SCSI_3 */
 
 	unsigned int manufacturer;	/* Manufacturer of device, for using 
 					 * vendor-specific cmd's */