[PATCH 2.5.bk] allow sbp2 driver to compile again

From: Stelian Pop (stelian.pop@fr.alcove.com)
Date: Wed Oct 30 2002 - 09:13:38 EST

Next message: Stelian Pop: "[PATCH 2.5.bk] make netfilter's ipt_TCPMSS compile again"
Previous message: Alan Cox: "Re: Abbott and Costello meet Crunch Time -- Penultimate 2.5 merge candidate list."
Next in thread: Ben Collins: "Re: [PATCH 2.5.bk] allow sbp2 driver to compile again"
Reply: Ben Collins: "Re: [PATCH 2.5.bk] allow sbp2 driver to compile again"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Hi,

The attached patch is required to make the sbp2 compile again.

Note however that, until 2.5.45 is released, one should tweak
the Makefile to manually change the version in order to get
the KERNEL_VERSION tests work...

Stelian.

===== drivers/ieee1394/sbp2.h 1.10 vs edited =====
--- 1.10/drivers/ieee1394/sbp2.h Sat Oct 12 23:40:06 2002
+++ edited/drivers/ieee1394/sbp2.h Wed Oct 30 12:32:39 2002
@@ -549,10 +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[]);
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,44)
+static int sbp2scsi_biosparam (struct scsi_device *sdev,
+ struct block_device *dev, sector_t capacity, int geom[]);
#else
-static int sbp2scsi_biosparam (Scsi_Disk *disk, struct block_device *dev, int geom[]);
+static int sbp2scsi_biosparam (Scsi_Disk *disk, kdev_t dev, int geom[]);
#endif
static int sbp2scsi_abort (Scsi_Cmnd *SCpnt);
static int sbp2scsi_reset (Scsi_Cmnd *SCpnt);
===== drivers/ieee1394/sbp2.c 1.16 vs edited =====
--- 1.16/drivers/ieee1394/sbp2.c Tue Oct 29 01:27:33 2002
+++ edited/drivers/ieee1394/sbp2.c Wed Oct 30 12:32:58 2002
@@ -3139,12 +3139,12 @@
*/
#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,44)
static int sbp2scsi_biosparam (struct scsi_device *sdev,
- struct block_device *dev, sector_t capacy, int geom[])
+ struct block_device *dev, sector_t capacity, int geom[])
{
#else
static int sbp2scsi_biosparam (Scsi_Disk *disk, kdev_t dev, int geom[])
{
- sector_t capacy = disk->capacity;
+ sector_t capacity = disk->capacity;
#endif
int heads, sectors, cylinders;

-- 
Stelian Pop <stelian.pop@fr.alcove.com>
Alcove - http://www.alcove.com
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Next message: Stelian Pop: "[PATCH 2.5.bk] make netfilter's ipt_TCPMSS compile again"
Previous message: Alan Cox: "Re: Abbott and Costello meet Crunch Time -- Penultimate 2.5 merge candidate list."
Next in thread: Ben Collins: "Re: [PATCH 2.5.bk] allow sbp2 driver to compile again"
Reply: Ben Collins: "Re: [PATCH 2.5.bk] allow sbp2 driver to compile again"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

This archive was generated by hypermail 2b29 : Thu Oct 31 2002 - 22:00:47 EST