--- 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;