--- zzzz-none-000/linux-2.6.19.2/drivers/scsi/aic7xxx/aic7xxx_proc.c	2007-01-10 19:10:37.000000000 +0000
+++ davinci-8020-5505/linux-2.6.19.2/drivers/scsi/aic7xxx/aic7xxx_proc.c	2007-01-11 07:38:19.000000000 +0000
@@ -182,6 +182,7 @@
 		      u_int our_id, char channel, u_int target_id,
 		      u_int target_offset)
 {
+	struct	ahc_linux_target *targ;
 	struct	scsi_target *starget;
 	struct	ahc_initiator_tinfo *tinfo;
 	struct	ahc_tmode_tstate *tstate;
@@ -197,6 +198,7 @@
 	starget = ahc->platform_data->starget[target_offset];
 	if (!starget)
 		return;
+	targ = scsi_transport_target_data(starget);
 
 	copy_info(info, "\tGoal: ");
 	ahc_format_transinfo(info, &tinfo->goal);
@@ -206,7 +208,7 @@
 	for (lun = 0; lun < AHC_NUM_LUNS; lun++) {
 		struct scsi_device *sdev;
 
-		sdev = scsi_device_lookup_by_target(starget, lun);
+		sdev = targ->sdev[lun];
 
 		if (sdev == NULL)
 			continue;
@@ -381,11 +383,11 @@
 	}
 	copy_info(&info, "\n");
 
-	max_targ = 16;
+	max_targ = 15;
 	if ((ahc->features & (AHC_WIDE|AHC_TWIN)) == 0)
-		max_targ = 8;
+		max_targ = 7;
 
-	for (i = 0; i < max_targ; i++) {
+	for (i = 0; i <= max_targ; i++) {
 		u_int our_id;
 		u_int target_id;
 		char channel;