From: Stelian Pop <stelian.pop@fr.alcove.com>
To: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Cc: linux1394-devel@lists.sourceforge.net
Subject: [PATCH 2.5.bk] allow sbp2 driver to compile again
Date: Wed, 30 Oct 2002 15:13:38 +0100 [thread overview]
Message-ID: <20021030141338.GF17103@tahoe.alcove-fr> (raw)
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
next reply other threads:[~2002-10-30 14:07 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2002-10-30 14:13 Stelian Pop [this message]
2002-10-30 14:26 ` [PATCH 2.5.bk] allow sbp2 driver to compile again Ben Collins
2002-10-30 14:32 ` Stelian Pop
2002-10-30 14:37 ` Ben Collins
2002-10-30 14:40 ` Stelian Pop
2002-10-30 15:50 ` Ben Collins
2002-10-30 15:04 ` Stelian Pop
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20021030141338.GF17103@tahoe.alcove-fr \
--to=stelian.pop@fr.alcove.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux1394-devel@lists.sourceforge.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).