Merge aladin.rdu.redhat.com:/usr/local/home/dledford/bk/linus-2.5

into aladin.rdu.redhat.com:/usr/src/2.5

drivers/message/fusion/mptscsih.h

@@ -230,8 +230,8 @@ extern	int		 x_scsi_host_reset(Scsi_Cmnd *);
 extern	int		 x_scsi_old_abort(Scsi_Cmnd *);
 extern	int		 x_scsi_old_reset(Scsi_Cmnd *, unsigned int);
 #endif
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,28)
-extern	int		 x_scsi_bios_param(Disk *, struct block_device *, int *);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,45)
+extern	int		 x_scsi_bios_param(Scsi_Device *, struct block_device *, sector_t, int[]);
 #else
 extern	int		 x_scsi_bios_param(Disk *, kdev_t, int *);
 #endif