patch-2.4.20 linux-2.4.20/drivers/ieee1394/sbp2.h

Next file: linux-2.4.20/drivers/ieee1394/video1394.c
Previous file: linux-2.4.20/drivers/ieee1394/sbp2.c
Back to the patch index
Back to the overall index

diff -urN linux-2.4.19/drivers/ieee1394/sbp2.h linux-2.4.20/drivers/ieee1394/sbp2.h
@@ -549,7 +549,11 @@
 static int sbp2scsi_detect (Scsi_Host_Template *tpnt);
 static const char *sbp2scsi_info (struct Scsi_Host *host);
 void sbp2scsi_setup(char *str, int *ints);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,28)
 static int sbp2scsi_biosparam (Scsi_Disk *disk, kdev_t dev, int geom[]);
+#else
+static int sbp2scsi_biosparam (Scsi_Disk *disk, struct block_device *dev, int geom[]);
+#endif
 static int sbp2scsi_abort (Scsi_Cmnd *SCpnt); 
 static int sbp2scsi_reset (Scsi_Cmnd *SCpnt); 
 static int sbp2scsi_queuecommand (Scsi_Cmnd *SCpnt, void (*done)(Scsi_Cmnd *));

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)