PATCH: linux-2.4.13-pre5/drivers/message/i2o directory adjustments

PATCH: linux-2.4.13-pre5/drivers/message/i2o directory adjustments

[Adam J. Richter]

[-- Attachment #1: Type: text/plain, Size: 696 bytes --]

	Some files in linux-2.4.13-pre5 were not updated to reflect
the fact that drivers/i2o was moved to drivers/message/i2o, so the
kernel will not compile.  Also, it looks like the code expects
the "pdev" field to be part of struct i2o_pci, but the .h file
was not updated.  I have included a possible patch to fix that
problem too, although perhaps the i2o maintainers may wish to
propose a different patch.

-- 
Adam J. Richter     __     ______________   4880 Stevens Creek Blvd, Suite 104
adam@yggdrasil.com     \ /                  San Jose, California 95129-1034
+1 408 261-6630         | g g d r a s i l   United States of America
fax +1 408 261-6631      "Free Software For The Rest Of Us."

[-- Attachment #2: diffs --]
[-- Type: text/plain, Size: 1447 bytes --]

--- linux-2.4.13-pre5/drivers/Makefile	Fri Oct 19 00:58:41 2001
+++ linux/drivers/Makefile	Fri Oct 19 05:52:10 2001
@@ -7,7 +7,7 @@
 
 
 mod-subdirs :=	dio mtd sbus video macintosh usb input telephony sgi ide \
-		i2o message/fusion scsi md ieee1394 pnp isdn atm \
+		message/fusion message/i2o scsi md ieee1394 pnp isdn atm \
 		fc4 net/hamradio i2c acpi bluetooth
 
 subdir-y :=	parport char block net sound misc media cdrom
--- linux-2.4.13-pre5/drivers/message/i2o/i2o_scsi.c	Fri Oct 19 00:58:41 2001
+++ linux/drivers/message/i2o/i2o_scsi.c	Fri Oct 19 05:52:44 2001
@@ -48,9 +48,9 @@
 #include <linux/blk.h>
 #include <linux/version.h>
 #include <linux/i2o.h>
-#include "../scsi/scsi.h"
-#include "../scsi/hosts.h"
-#include "../scsi/sd.h"
+#include "../../scsi/scsi.h"
+#include "../../scsi/hosts.h"
+#include "../../scsi/sd.h"
 #include "i2o_scsi.h"
 
 #define VERSION_STRING        "Version 0.0.1"
@@ -909,4 +909,4 @@
 
 static Scsi_Host_Template driver_template = I2OSCSI;
 
-#include "../scsi/scsi_module.c"
+#include "../../scsi/scsi_module.c"
--- /tmp/adam/linux-2.4.13-pre5/include/linux/i2o.h	Fri Oct 19 00:58:42 2001
+++ /tmp/adam/linux/include/linux/i2o.h	Fri Oct 19 05:56:16 2001
@@ -88,6 +89,7 @@
 	int		mtrr_reg0;
 	int		mtrr_reg1;
 #endif
+	struct pci_dev *pdev;		/* PCI device */
 };
 
 /*
@@ -101,8 +103,6 @@
  */
 struct i2o_controller
 {
-	struct pci_dev *pdev;		/* PCI device */
-
 	char name[16];
 	int unit;
 	int type;

Re: PATCH: linux-2.4.13-pre5/drivers/message/i2o directory adjustments

[Russell King]

On Fri, Oct 19, 2001 at 05:59:44AM -0700, Adam J. Richter wrote:
> 	Some files in linux-2.4.13-pre5 were not updated to reflect
> the fact that drivers/i2o was moved to drivers/message/i2o, so the
> kernel will not compile.  Also, it looks like the code expects
> the "pdev" field to be part of struct i2o_pci, but the .h file
> was not updated.  I have included a possible patch to fix that
> problem too, although perhaps the i2o maintainers may wish to
> propose a different patch.

Please look at the 12-ac3 patch - Alan didn't finish merging the i2o
changes, and you should take the fix for this from the -ac tree.

--
Russell King (rmk@arm.linux.org.uk)                The developer of ARM Linux
             http://www.arm.linux.org.uk/personal/aboutme.html

Re: PATCH: linux-2.4.13-pre5/drivers/message/i2o directory adjustments

[Jeff Garzik]

I prefer this patch:
ftp://ftp.kernel.org/pub/linux/kernel/people/jgarzik/patches/2.4.13/i2o-build-2.4.13.5.patch.gz

I missed the drivers/Makefile change though.

-- 
Jeff Garzik      | Only so many songs can be sung
Building 1024    | with two lips, two lungs, and one tongue.
MandrakeSoft     |         - nomeansno

Re: PATCH: linux-2.4.13-pre5/drivers/message/i2o directory adjustments

[Alan Cox]

> I prefer this patch:
> ftp://ftp.kernel.org/pub/linux/kernel/people/jgarzik/patches/2.4.13/i2o-build-2.4.13.5.patch.gz
> 
> I missed the drivers/Makefile change though.

I have i2o patches for Linus pending. Please be patient, I ended up dealing
with builders and being away at a show

Alan