- fix for sbp2.c

Changed files:
    linux-2.5-miscfix.patch -> 1.3

diff --git a/linux-2.5-miscfix.patch b/linux-2.5-miscfix.patch
index dac923fe1594605617bbe018f3e9a81f20a49064..817c87167a4207d8b52c40776ee70dbd21781b74 100644 (file)
--- a/linux-2.5-miscfix.patch
+++ b/linux-2.5-miscfix.patch
@@ -1,12 +1,12 @@
---- linux-2.5.72/drivers/ide/legacy/pdc4030.c~ 2003-06-17 06:20:02.000000000 +0200
-+++ linux-2.5.72/drivers/ide/legacy/pdc4030.c  2003-06-17 16:00:05.000000000 +0200
-@@ -818,7 +818,8 @@
-          Feature register.
-          FIXME: Is promise_selectproc now redundant??
-       */
--      int drive_number = (HWIF(drive)->channel << 1) + drive->select.b.unit;
-+      ide_hwif_t *hwif        = HWIF(drive);
-+      int drive_number        = (hwif->channel << 1) + drive->select.b.unit;
- #ifdef CONFIG_IDE_TASKFILE_IO
-       struct hd_drive_task_hdr taskfile;
-       ide_task_t args;
+diff -urN linux-2.5.74-bk1/drivers/ieee1394/sbp2.c linux-2.5.74-bk2/drivers/ieee1394/sbp2.c
+--- linux-2.5.74-bk1/drivers/ieee1394/sbp2.c   2003-07-02 13:41:44.000000000 -0700
++++ linux-2.5.74-bk2/drivers/ieee1394/sbp2.c   2003-07-04 05:07:11.000000000 -0700
+@@ -56,6 +56,8 @@
+ #include <linux/smp_lock.h>
+ #include <linux/init.h>
+ #include <linux/version.h>
++#include <linux/pci.h>
++
+ #include <asm/current.h>
+ #include <asm/uaccess.h>
+ #include <asm/io.h>