[PATCH] fix drivers/scsi/sd.c for ppc32

[Paul Mackerras]

Linus,

This patch fixes the compile errors in sd_find_target, which is only
used on 32-bit PPC systems, and changes the ifdef around from
CONFIG_PPC to CONFIG_PPC32 since ppc64 doesn't need this routine.

The patch is against 2.5.15.  Please apply it to your tree.

Thanks,
Paul.

diff -urN linux-2.5/drivers/scsi/sd.c pmac-2.5/drivers/scsi/sd.c
--- linux-2.5/drivers/scsi/sd.c	Sat May  4 09:24:38 2002
+++ pmac-2.5/drivers/scsi/sd.c	Thu May  9 14:05:26 2002
@@ -129,7 +129,7 @@
 static Scsi_Disk * sd_get_sdisk(int index);
 
 
-#if defined(CONFIG_PPC)
+#if defined(CONFIG_PPC32)
 /**
  *	sd_find_target - find kdev_t of first scsi disk that matches
  *	given host and scsi_id. 
@@ -149,7 +149,7 @@
 {
 	Scsi_Disk *sdkp;
 	Scsi_Device *sdp;
-	Scsi_Host *shp = hp;
+	struct Scsi_Host *shp = hp;
 	int dsk_nr;
 	unsigned long iflags;
 
@@ -162,7 +162,7 @@
 		sdp = sdkp->device;
 		if (sdp && (sdp->host == shp) && (sdp->id == scsi_id)) {
 			read_unlock_irqrestore(&sd_dsk_arr_lock, iflags);
-			return MKDEV_SD(k);
+			return MKDEV_SD(dsk_nr);
 		}
 	}
 	read_unlock_irqrestore(&sd_dsk_arr_lock, iflags);