Skip to contentSkip to conversation

replace deprecated hosts.h file

PATCH Arjan van de Ven 4 participants 11 messages May 29, 2004 – May 30, 2004

Subsystems (19)
SCSI QLogic QLA2XXX FC-SCSI driver Megaraid SCSI/SAS drivers AIC7XXX / AIC79XX SCSI driver +15 more subsystems
lore
Share & tools
lore

Arjan van de Ven

author
#0 lore raw

Hi,

resend of the hosts.h -> scsi/scsi_host.h diff against current linus BK. The sooner we remove the users of hosts.h the sooner we can make sure new code doesn't use it....

drivers/scsi/3w-xxxx.c renamed from drivers/scsi.org/3w-xxxx.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/3w-xxxx.c linux-2.6.6/drivers/scsi/3w-xxxx.c
@@ -220,7 +220,7 @@ MODULE_LICENSE("GPL");
 #define __3W_C			/* let 3w-xxxx.h know it is use */
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 #include "3w-xxxx.h"
drivers/scsi/53c700.c renamed from drivers/scsi.org/53c700.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/53c700.c linux-2.6.6/drivers/scsi/53c700.c
@@ -135,7 +135,7 @@
 #include <linux/interrupt.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 #include <scsi/scsi_transport.h>
 #include <scsi/scsi_transport_spi.h>
drivers/scsi/53c7xx.c renamed from drivers/scsi.org/53c7xx.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/53c7xx.c linux-2.6.6/drivers/scsi/53c7xx.c
@@ -280,7 +280,7 @@
 #endif
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "53c7xx.h"
 #include <linux/stat.h>
 #include <linux/stddef.h>
drivers/scsi/a2091.c renamed from drivers/scsi.org/a2091.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/a2091.c linux-2.6.6/drivers/scsi/a2091.c
@@ -16,7 +16,7 @@
 #include <linux/spinlock.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "wd33c93.h"
 #include "a2091.h"
drivers/scsi/a3000.c renamed from drivers/scsi.org/a3000.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/a3000.c linux-2.6.6/drivers/scsi/a3000.c
@@ -15,7 +15,7 @@
 #include <asm/irq.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "wd33c93.h"
 #include "a3000.h"
drivers/scsi/advansys.c renamed from drivers/scsi.org/advansys.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/advansys.c linux-2.6.6/drivers/scsi/advansys.c
@@ -807,7 +807,7 @@
 #include <asm/dma.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "advansys.h"
 #ifdef CONFIG_PCI
 #include <linux/pci.h>
drivers/scsi/aha1542.c renamed from drivers/scsi.org/aha1542.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/aha1542.c linux-2.6.6/drivers/scsi/aha1542.c
@@ -47,7 +47,7 @@
 #include <asm/io.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "aha1542.h"
 
 #define SCSI_BUF_PA(address)	isa_virt_to_bus(address)
drivers/scsi/aha1740.c renamed from drivers/scsi.org/aha1740.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/aha1740.c linux-2.6.6/drivers/scsi/aha1740.c
@@ -56,7 +56,7 @@
 #include <asm/io.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "aha1740.h"
 
 /* IF YOU ARE HAVING PROBLEMS WITH THIS DRIVER, AND WANT TO WATCH
drivers/scsi/aic7xxx/aic79xx_osm.h renamed from drivers/scsi.org/aic7xxx/aic79xx_osm.h +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/aic7xxx/aic79xx_osm.h linux-2.6.6/drivers/scsi/aic7xxx/aic79xx_osm.h
@@ -68,7 +68,7 @@
 /* Core SCSI definitions */
 #define AIC_LIB_PREFIX ahd
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 /* Name space conflict with BSD queue macros */
 #ifdef LIST_HEAD
drivers/scsi/aic7xxx/aic7xxx_osm.h renamed from drivers/scsi.org/aic7xxx/aic7xxx_osm.h +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/aic7xxx/aic7xxx_osm.h linux-2.6.6/drivers/scsi/aic7xxx/aic7xxx_osm.h
@@ -85,7 +85,7 @@
 /* Core SCSI definitions */
 #define AIC_LIB_PREFIX ahc
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 /* Name space conflict with BSD queue macros */
 #ifdef LIST_HEAD
drivers/scsi/aic7xxx/aiclib.c renamed from drivers/scsi.org/aic7xxx/aiclib.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/aic7xxx/aiclib.c linux-2.6.6/drivers/scsi/aic7xxx/aiclib.c
@@ -36,7 +36,7 @@
 
 /* Core SCSI definitions */
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "aiclib.h"
 #include "cam.h"
drivers/scsi/aic7xxx_old.c renamed from drivers/scsi.org/aic7xxx_old.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/aic7xxx_old.c linux-2.6.6/drivers/scsi/aic7xxx_old.c
@@ -239,7 +239,7 @@
 #include <linux/smp.h>
 #include <linux/interrupt.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "aic7xxx_old/aic7xxx.h"
 
 #include "aic7xxx_old/sequencer.h"
drivers/scsi/amiga7xx.c renamed from drivers/scsi.org/amiga7xx.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/amiga7xx.c linux-2.6.6/drivers/scsi/amiga7xx.c
@@ -25,7 +25,7 @@
 #include <asm/irq.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "53c7xx.h"
 #include "amiga7xx.h"
drivers/scsi/ata_piix.c renamed from drivers/scsi.org/ata_piix.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/ata_piix.c linux-2.6.6/drivers/scsi/ata_piix.c
@@ -28,7 +28,7 @@
 #include <linux/blkdev.h>
 #include <linux/delay.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <linux/libata.h>
 
 #define DRV_NAME	"ata_piix"
drivers/scsi/atari_scsi.c renamed from drivers/scsi.org/atari_scsi.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/atari_scsi.c linux-2.6.6/drivers/scsi/atari_scsi.c
@@ -102,7 +102,7 @@
 #include <asm/bitops.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "atari_scsi.h"
 #include "NCR5380.h"
 #include <asm/atari_stdma.h>
drivers/scsi/atp870u.c renamed from drivers/scsi.org/atp870u.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/atp870u.c linux-2.6.6/drivers/scsi/atp870u.c
@@ -34,7 +34,7 @@
 #include <asm/io.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "atp870u.h"
 
 /*
drivers/scsi/blz1230.c renamed from drivers/scsi.org/blz1230.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/blz1230.c linux-2.6.6/drivers/scsi/blz1230.c
@@ -28,7 +28,7 @@
 #include <linux/interrupt.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "NCR53C9x.h"
 
 #include <linux/zorro.h>
drivers/scsi/blz2060.c renamed from drivers/scsi.org/blz2060.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/blz2060.c linux-2.6.6/drivers/scsi/blz2060.c
@@ -28,7 +28,7 @@
 #include <linux/interrupt.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "NCR53C9x.h"
 
 #include <linux/zorro.h>
drivers/scsi/BusLogic.c renamed from drivers/scsi.org/BusLogic.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/BusLogic.c linux-2.6.6/drivers/scsi/BusLogic.c
@@ -48,7 +48,7 @@
 #include <asm/system.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "BusLogic.h"
 #include "FlashPoint.c"
drivers/scsi/bvme6000.c renamed from drivers/scsi.org/bvme6000.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/bvme6000.c linux-2.6.6/drivers/scsi/bvme6000.c
@@ -17,7 +17,7 @@
 #include <asm/irq.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "53c7xx.h"
 #include "bvme6000.h"
drivers/scsi/constants.c renamed from drivers/scsi.org/constants.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/constants.c linux-2.6.6/drivers/scsi/constants.c
@@ -12,7 +12,7 @@
 #include <linux/blkdev.h>
 #include <linux/kernel.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 #define CONST_COMMAND   0x01
 #define CONST_STATUS    0x02
drivers/scsi/cpqfcTScontrol.c renamed from drivers/scsi.org/cpqfcTScontrol.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/cpqfcTScontrol.c linux-2.6.6/drivers/scsi/cpqfcTScontrol.c
@@ -45,7 +45,7 @@
 #include <linux/spinlock.h>
 
 #include "scsi.h"
-#include "hosts.h"   // Scsi_Host definition for INT handler
+#include <scsi/scsi_host.h>   // Scsi_Host definition for INT handler
 #include "cpqfcTSchip.h"
 #include "cpqfcTSstructs.h"
drivers/scsi/cpqfcTSinit.c renamed from drivers/scsi.org/cpqfcTSinit.c +2 -2
diff -purN linux-2.6.6/drivers/scsi.org/cpqfcTSinit.c linux-2.6.6/drivers/scsi/cpqfcTSinit.c
@@ -51,7 +51,7 @@
 #include <asm/irq.h>
 #include <linux/spinlock.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <scsi/scsi_ioctl.h>
 #include "cpqfcTSchip.h"
 #include "cpqfcTSstructs.h"

@@ -1266,7 +1266,7 @@ static void QueLinkDownCmnd( CPQFCHBA *c
 
 
 
-// The file "hosts.h" says not to call scsi_done from
+// The file <scsi/scsi_host.h> says not to call scsi_done from
 // inside _queuecommand, so we'll do it from the heartbeat timer
 // (clarification: Turns out it's ok to call scsi_done from queuecommand 
 // for cases that don't go to the hardware like scsi cmds destined
drivers/scsi/cpqfcTSworker.c renamed from drivers/scsi.org/cpqfcTSworker.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/cpqfcTSworker.c linux-2.6.6/drivers/scsi/cpqfcTSworker.c
@@ -39,7 +39,7 @@
 #include <asm/dma.h>
 
 #include "scsi.h"
-#include "hosts.h"   // struct Scsi_Host definition for T handler
+#include <scsi/scsi_host.h>   // struct Scsi_Host definition for T handler
 #include "cpqfcTSchip.h"
 #include "cpqfcTSstructs.h"
 #include "cpqfcTStrigger.h"
drivers/scsi/cyberstorm.c renamed from drivers/scsi.org/cyberstorm.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/cyberstorm.c linux-2.6.6/drivers/scsi/cyberstorm.c
@@ -31,7 +31,7 @@
 #include <linux/interrupt.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "NCR53C9x.h"
 
 #include <linux/zorro.h>
drivers/scsi/cyberstormII.c renamed from drivers/scsi.org/cyberstormII.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/cyberstormII.c linux-2.6.6/drivers/scsi/cyberstormII.c
@@ -27,7 +27,7 @@
 #include <linux/interrupt.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "NCR53C9x.h"
 
 #include <linux/zorro.h>
drivers/scsi/dc395x.c renamed from drivers/scsi.org/dc395x.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/dc395x.c linux-2.6.6/drivers/scsi/dc395x.c
@@ -53,7 +53,7 @@
 #include <linux/blkdev.h>
 #include <asm/io.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "dc395x.h"
 #include <scsi/scsicam.h>	/* needed for scsicam_bios_param */
 #include <linux/interrupt.h>
drivers/scsi/dec_esp.c renamed from drivers/scsi.org/dec_esp.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/dec_esp.c linux-2.6.6/drivers/scsi/dec_esp.c
@@ -29,7 +29,7 @@
 #include <linux/stat.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "NCR53C9x.h"
 
 #include <asm/irq.h>
drivers/scsi/dmx3191d.c renamed from drivers/scsi.org/dmx3191d.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/dmx3191d.c linux-2.6.6/drivers/scsi/dmx3191d.c
@@ -34,7 +34,7 @@
 #include <linux/delay.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 #include "dmx3191d.h"
drivers/scsi/dpt_i2o.c renamed from drivers/scsi.org/dpt_i2o.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/dpt_i2o.c linux-2.6.6/drivers/scsi/dpt_i2o.c
@@ -65,7 +65,7 @@ MODULE_DESCRIPTION("Adaptec I2O RAID Dri
 #include <asm/io.h>		/* for virt_to_bus, etc. */
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 #include "dpt/dptsig.h"
 #include "dpti.h"
drivers/scsi/dtc.c renamed from drivers/scsi.org/dtc.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/dtc.c linux-2.6.6/drivers/scsi/dtc.c
@@ -84,7 +84,7 @@
 #include <linux/interrupt.h>
 #include <asm/io.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "dtc.h"
 #define AUTOPROBE_IRQ
 #include "NCR5380.h"
drivers/scsi/eata.c renamed from drivers/scsi.org/eata.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/eata.c linux-2.6.6/drivers/scsi/eata.c
@@ -495,7 +495,7 @@
 #include <linux/spinlock.h>
 #include <scsi/scsicam.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <asm/dma.h>
 #include <asm/irq.h>
drivers/scsi/eata_pio.c renamed from drivers/scsi.org/eata_pio.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/eata_pio.c linux-2.6.6/drivers/scsi/eata_pio.c
@@ -63,7 +63,7 @@
 #include <asm/io.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <scsi/scsicam.h>
 
 #include "eata_generic.h"
drivers/scsi/esp.c renamed from drivers/scsi.org/esp.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/esp.c linux-2.6.6/drivers/scsi/esp.c
@@ -27,7 +27,7 @@
 #include <linux/interrupt.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "esp.h"
 
 #include <asm/sbus.h>
drivers/scsi/fastlane.c renamed from drivers/scsi.org/fastlane.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/fastlane.c linux-2.6.6/drivers/scsi/fastlane.c
@@ -36,7 +36,7 @@
 #include <linux/interrupt.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "NCR53C9x.h"
 
 #include <linux/zorro.h>
drivers/scsi/fcal.c renamed from drivers/scsi.org/fcal.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/fcal.c linux-2.6.6/drivers/scsi/fcal.c
@@ -21,7 +21,7 @@
 #include <asm/irq.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "../fc4/fcp_impl.h"
 #include "fcal.h"
drivers/scsi/fd_mcs.c renamed from drivers/scsi.org/fd_mcs.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/fd_mcs.c linux-2.6.6/drivers/scsi/fd_mcs.c
@@ -93,7 +93,7 @@
 #include <asm/system.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "fd_mcs.h"
 
 #define DRIVER_VERSION "v0.2 by ZP Gu<[email protected]>"
drivers/scsi/fdomain.c renamed from drivers/scsi.org/fdomain.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/fdomain.c linux-2.6.6/drivers/scsi/fdomain.c
@@ -284,7 +284,7 @@
 #include <asm/system.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 MODULE_AUTHOR("Rickard E. Faith");
 MODULE_DESCRIPTION("Future domain SCSI driver");
drivers/scsi/g_NCR5380.c renamed from drivers/scsi.org/g_NCR5380.c +1 -1
@@ -107,7 +107,7 @@
 #include <linux/sched.h>
 #include <linux/blkdev.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "g_NCR5380.h"
 #include "NCR5380.h"
 #include <linux/stat.h>
drivers/scsi/gvp11.c renamed from drivers/scsi.org/gvp11.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/gvp11.c linux-2.6.6/drivers/scsi/gvp11.c
@@ -16,7 +16,7 @@
 #include <linux/spinlock.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "wd33c93.h"
 #include "gvp11.h"
drivers/scsi/i60uscsi.c renamed from drivers/scsi.org/i60uscsi.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/i60uscsi.c linux-2.6.6/drivers/scsi/i60uscsi.c
@@ -81,7 +81,7 @@
 #include <asm/io.h>
 #include <linux/blkdev.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "inia100.h"
 
 #define JIFFIES_TO_MS(t) ((t) * 1000 / HZ)
drivers/scsi/ibmmca.c renamed from drivers/scsi.org/ibmmca.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/ibmmca.c linux-2.6.6/drivers/scsi/ibmmca.c
@@ -45,7 +45,7 @@
 #include <asm/io.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "ibmmca.h"
 
 /* current version of this driver-source: */
drivers/scsi/ide-scsi.c renamed from drivers/scsi.org/ide-scsi.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/ide-scsi.c linux-2.6.6/drivers/scsi/ide-scsi.c
@@ -51,7 +51,7 @@
 #include <asm/uaccess.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <scsi/sg.h>
 
 #define IDESCSI_DEBUG_LOG		0
drivers/scsi/imm.h renamed from drivers/scsi.org/imm.h +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/imm.h linux-2.6.6/drivers/scsi/imm.h
@@ -79,7 +79,7 @@
 #include  <linux/interrupt.h>
 
 #include  <asm/io.h>
-#include  "hosts.h"
+#include  <scsi/scsi_host.h>
 /* batteries not included :-) */
 
 /*
drivers/scsi/in2000.c renamed from drivers/scsi.org/in2000.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/in2000.c linux-2.6.6/drivers/scsi/in2000.c
@@ -126,7 +126,7 @@
 #include <asm/system.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 #define IN2000_VERSION    "1.33-2.5"
 #define IN2000_DATE       "2002/11/03"
drivers/scsi/ini9100u.c renamed from drivers/scsi.org/ini9100u.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/ini9100u.c linux-2.6.6/drivers/scsi/ini9100u.c
@@ -136,7 +136,7 @@
 #include <asm/io.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "ini9100u.h"
 
 #ifdef DEBUG_i91u
drivers/scsi/ips.c renamed from drivers/scsi.org/ips.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/ips.c linux-2.6.6/drivers/scsi/ips.c
@@ -176,7 +176,7 @@
 #include <scsi/sg.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "ips.h"
 
 #include <linux/module.h>
drivers/scsi/jazz_esp.c renamed from drivers/scsi.org/jazz_esp.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/jazz_esp.c linux-2.6.6/drivers/scsi/jazz_esp.c
@@ -16,7 +16,7 @@
 #include <linux/stat.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "NCR53C9x.h"
 
 #include <asm/irq.h>
drivers/scsi/lasi700.c renamed from drivers/scsi.org/lasi700.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/lasi700.c linux-2.6.6/drivers/scsi/lasi700.c
@@ -50,7 +50,7 @@
 #include <asm/delay.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 #include "lasi700.h"
 #include "53c700.h"
drivers/scsi/libata-core.c renamed from drivers/scsi.org/libata-core.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/libata-core.c linux-2.6.6/drivers/scsi/libata-core.c
@@ -39,7 +39,7 @@
 #include <linux/workqueue.h>
 #include <scsi/scsi.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <linux/libata.h>
 #include <asm/io.h>
 #include <asm/semaphore.h>
drivers/scsi/libata-scsi.c renamed from drivers/scsi.org/libata-scsi.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/libata-scsi.c linux-2.6.6/drivers/scsi/libata-scsi.c
@@ -27,7 +27,7 @@
 #include <linux/spinlock.h>
 #include <scsi/scsi.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <linux/libata.h>
 
 #include "libata.h"
drivers/scsi/mac_esp.c renamed from drivers/scsi.org/mac_esp.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/mac_esp.c linux-2.6.6/drivers/scsi/mac_esp.c
@@ -26,7 +26,7 @@
 #include <linux/interrupt.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "NCR53C9x.h"
 
 #include <asm/io.h>
drivers/scsi/mac_scsi.c renamed from drivers/scsi.org/mac_scsi.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/mac_scsi.c linux-2.6.6/drivers/scsi/mac_scsi.c
@@ -52,7 +52,7 @@
 #include <asm/mac_via.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "mac_scsi.h"
 #include "NCR5380.h"
drivers/scsi/mca_53c9x.c renamed from drivers/scsi.org/mca_53c9x.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/mca_53c9x.c linux-2.6.6/drivers/scsi/mca_53c9x.c
@@ -43,7 +43,7 @@
 #include <linux/mca-legacy.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "NCR53C9x.h"
 
 #include <asm/dma.h>
drivers/scsi/megaraid.c renamed from drivers/scsi.org/megaraid.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/megaraid.c linux-2.6.6/drivers/scsi/megaraid.c
@@ -49,7 +49,7 @@
 #include <scsi/scsicam.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 #include "megaraid.h"
drivers/scsi/mvme147.c renamed from drivers/scsi.org/mvme147.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/mvme147.c linux-2.6.6/drivers/scsi/mvme147.c
@@ -11,7 +11,7 @@
 #include <asm/irq.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "wd33c93.h"
 #include "mvme147.h"
drivers/scsi/mvme16x.c renamed from drivers/scsi.org/mvme16x.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/mvme16x.c linux-2.6.6/drivers/scsi/mvme16x.c
@@ -15,7 +15,7 @@
 #include <asm/irq.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "53c7xx.h"
 #include "mvme16x.h"
drivers/scsi/NCR53c406a.c renamed from drivers/scsi.org/NCR53c406a.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/NCR53c406a.c linux-2.6.6/drivers/scsi/NCR53c406a.c
@@ -54,7 +54,7 @@
 #include <linux/blkdev.h>
 #include <linux/spinlock.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 /* ============================================================= */
drivers/scsi/ncr53c8xx.c renamed from drivers/scsi.org/ncr53c8xx.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/ncr53c8xx.c linux-2.6.6/drivers/scsi/ncr53c8xx.c
@@ -138,7 +138,7 @@
 #include <asm/system.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 #include "ncr53c8xx.h"
drivers/scsi/NCR53C9x.c renamed from drivers/scsi.org/NCR53C9x.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/NCR53C9x.c linux-2.6.6/drivers/scsi/NCR53C9x.c
@@ -36,7 +36,7 @@
 #include <linux/init.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "NCR53C9x.h"
 
 #include <asm/system.h>
drivers/scsi/NCR_D700.c renamed from drivers/scsi.org/NCR_D700.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/NCR_D700.c linux-2.6.6/drivers/scsi/NCR_D700.c
@@ -100,7 +100,7 @@
 #include <asm/io.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 #include "53c700.h"
 #include "NCR_D700.h"
drivers/scsi/NCR_Q720.c renamed from drivers/scsi.org/NCR_Q720.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/NCR_Q720.c linux-2.6.6/drivers/scsi/NCR_Q720.c
@@ -16,7 +16,7 @@
 #include <asm/io.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 #include "ncr53c8xx.h"
drivers/scsi/nsp32.c renamed from drivers/scsi.org/nsp32.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/nsp32.c linux-2.6.6/drivers/scsi/nsp32.c
@@ -45,7 +45,7 @@
 #include <asm/io.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <scsi/scsi_ioctl.h>
 #include <scsi/scsi.h>
drivers/scsi/oktagon_esp.c renamed from drivers/scsi.org/oktagon_esp.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/oktagon_esp.c linux-2.6.6/drivers/scsi/oktagon_esp.c
@@ -29,7 +29,7 @@
 
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "NCR53C9x.h"
 
 #include <linux/zorro.h>
drivers/scsi/osst.c renamed from drivers/scsi.org/osst.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/osst.c linux-2.6.6/drivers/scsi/osst.c
@@ -61,7 +61,7 @@ const char * osst_version = "0.99.1";
 #define OSST_DEB_MSG  KERN_NOTICE
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <scsi/scsi_driver.h>
 #include <scsi/scsi_ioctl.h>
drivers/scsi/pas16.c renamed from drivers/scsi.org/pas16.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/pas16.c linux-2.6.6/drivers/scsi/pas16.c
@@ -125,7 +125,7 @@
 #include <linux/init.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "pas16.h"
 #define AUTOPROBE_IRQ
 #include "NCR5380.h"
drivers/scsi/pc980155.c renamed from drivers/scsi.org/pc980155.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/pc980155.c linux-2.6.6/drivers/scsi/pc980155.c
@@ -20,7 +20,7 @@
 #include <asm/dma.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "wd33c93.h"
 #include "pc980155.h"
drivers/scsi/pci2000.c renamed from drivers/scsi.org/pci2000.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/pci2000.c linux-2.6.6/drivers/scsi/pci2000.c
@@ -54,7 +54,7 @@
 #include <asm/io.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "pci2000.h"
 #include "psi_roy.h"
drivers/scsi/pci2220i.c renamed from drivers/scsi.org/pci2220i.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/pci2220i.c linux-2.6.6/drivers/scsi/pci2220i.c
@@ -59,7 +59,7 @@
 #include <asm/io.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "pci2220i.h"
 #include "psi_dale.h"
drivers/scsi/pcmcia/aha152x_stub.c renamed from drivers/scsi.org/pcmcia/aha152x_stub.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/pcmcia/aha152x_stub.c linux-2.6.6/drivers/scsi/pcmcia/aha152x_stub.c
@@ -47,7 +47,7 @@
 #include <scsi/scsi_ioctl.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "aha152x.h"
 
 #include <pcmcia/version.h>
drivers/scsi/pcmcia/fdomain_stub.c renamed from drivers/scsi.org/pcmcia/fdomain_stub.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/pcmcia/fdomain_stub.c linux-2.6.6/drivers/scsi/pcmcia/fdomain_stub.c
@@ -44,7 +44,7 @@
 #include <scsi/scsi_ioctl.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 #include <pcmcia/version.h>
 #include <pcmcia/cs_types.h>
drivers/scsi/pcmcia/qlogic_stub.c renamed from drivers/scsi.org/pcmcia/qlogic_stub.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/pcmcia/qlogic_stub.c linux-2.6.6/drivers/scsi/pcmcia/qlogic_stub.c
@@ -46,7 +46,7 @@
 #include <linux/interrupt.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "../qlogicfas408.h"
 
 #include <pcmcia/version.h>
drivers/scsi/pluto.c renamed from drivers/scsi.org/pluto.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/pluto.c linux-2.6.6/drivers/scsi/pluto.c
@@ -21,7 +21,7 @@
 #include <asm/irq.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "../fc4/fcp_impl.h"
 #include "pluto.h"
drivers/scsi/ppa.h renamed from drivers/scsi.org/ppa.h +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/ppa.h linux-2.6.6/drivers/scsi/ppa.h
@@ -86,7 +86,7 @@
 #include  <linux/interrupt.h>
 
 #include  <asm/io.h>
-#include  "hosts.h"
+#include  <scsi/scsi_host.h>
 /* batteries not included :-) */
 
 /*
drivers/scsi/psi240i.c renamed from drivers/scsi.org/psi240i.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/psi240i.c linux-2.6.6/drivers/scsi/psi240i.c
@@ -41,7 +41,7 @@
 #include <asm/system.h>
 #include <asm/io.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 #include "psi240i.h"
 #include "psi_chip.h"
drivers/scsi/qla1280.c renamed from drivers/scsi.org/qla1280.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/qla1280.c linux-2.6.6/drivers/scsi/qla1280.c
@@ -357,7 +357,7 @@
 #else
 #include <linux/blk.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "sd.h"
 #endif
drivers/scsi/qla2xxx/qla_os.h renamed from drivers/scsi.org/qla2xxx/qla_os.h +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/qla2xxx/qla_os.h linux-2.6.6/drivers/scsi/qla2xxx/qla_os.h
@@ -59,7 +59,7 @@
 #include <asm/uaccess.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 #include <scsi/scsicam.h>
 #include <scsi/scsi_ioctl.h>
drivers/scsi/qlogicfas408.c renamed from drivers/scsi.org/qlogicfas408.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/qlogicfas408.c linux-2.6.6/drivers/scsi/qlogicfas408.c
@@ -56,7 +56,7 @@
 #include <asm/dma.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "qlogicfas408.h"
 
 /*----------------------------------------------------------------*/
drivers/scsi/qlogicfas.c renamed from drivers/scsi.org/qlogicfas.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/qlogicfas.c linux-2.6.6/drivers/scsi/qlogicfas.c
@@ -32,7 +32,7 @@
 #include <asm/dma.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "qlogicfas408.h"
 
 /* Set the following to 2 to use normal interrupt (active high/totempole-
drivers/scsi/qlogicfc.c renamed from drivers/scsi.org/qlogicfc.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/qlogicfc.c linux-2.6.6/drivers/scsi/qlogicfc.c
@@ -64,7 +64,7 @@
 #include <asm/io.h>
 #include <asm/irq.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 #define pci64_dma_hi32(a) ((u32) (0xffffffff & (((u64)(a))>>32)))
 #define pci64_dma_lo32(a) ((u32) (0xffffffff & (((u64)(a)))))
drivers/scsi/qlogicisp.c renamed from drivers/scsi.org/qlogicisp.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/qlogicisp.c linux-2.6.6/drivers/scsi/qlogicisp.c
@@ -36,7 +36,7 @@
 #include <asm/irq.h>
 #include <asm/byteorder.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "qlogicisp.h"
 
 /* Configuration section *****************************************************/
drivers/scsi/qlogicpti.c renamed from drivers/scsi.org/qlogicpti.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/qlogicpti.c linux-2.6.6/drivers/scsi/qlogicpti.c
@@ -27,7 +27,7 @@
 #include <asm/byteorder.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "qlogicpti.h"
 
 #include <asm/sbus.h>
drivers/scsi/sata_promise.c renamed from drivers/scsi.org/sata_promise.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/sata_promise.c linux-2.6.6/drivers/scsi/sata_promise.c
@@ -34,7 +34,7 @@
 #include <linux/interrupt.h>
 #include <linux/sched.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <linux/libata.h>
 #include <asm/io.h>
 #include "sata_promise.h"
drivers/scsi/sata_sil.c renamed from drivers/scsi.org/sata_sil.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/sata_sil.c linux-2.6.6/drivers/scsi/sata_sil.c
@@ -34,7 +34,7 @@
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <linux/libata.h>
 
 #define DRV_NAME	"sata_sil"
drivers/scsi/sata_sis.c renamed from drivers/scsi.org/sata_sis.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/sata_sis.c linux-2.6.6/drivers/scsi/sata_sis.c
@@ -34,7 +34,7 @@
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <linux/libata.h>
 
 #define DRV_NAME	"sata_sis"
drivers/scsi/sata_svw.c renamed from drivers/scsi.org/sata_svw.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/sata_svw.c linux-2.6.6/drivers/scsi/sata_svw.c
@@ -40,7 +40,7 @@
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <linux/libata.h>
 
 #ifdef CONFIG_PPC_OF
drivers/scsi/sata_sx4.c renamed from drivers/scsi.org/sata_sx4.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/sata_sx4.c linux-2.6.6/drivers/scsi/sata_sx4.c
@@ -34,7 +34,7 @@
 #include <linux/interrupt.h>
 #include <linux/sched.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <linux/libata.h>
 #include <asm/io.h>
 #include "sata_promise.h"
drivers/scsi/sata_via.c renamed from drivers/scsi.org/sata_via.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/sata_via.c linux-2.6.6/drivers/scsi/sata_via.c
@@ -33,7 +33,7 @@
 #include <linux/blkdev.h>
 #include <linux/delay.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <linux/libata.h>
 #include <asm/io.h>
drivers/scsi/sata_vsc.c renamed from drivers/scsi.org/sata_vsc.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/sata_vsc.c linux-2.6.6/drivers/scsi/sata_vsc.c
@@ -22,7 +22,7 @@
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <linux/libata.h>
 
 #define DRV_NAME	"sata_vsc"
drivers/scsi/scsicam.c renamed from drivers/scsi.org/scsicam.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/scsicam.c linux-2.6.6/drivers/scsi/scsicam.c
@@ -19,7 +19,7 @@
 #include <linux/buffer_head.h>
 #include <asm/unaligned.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <scsi/scsicam.h>
 
 static int setsize(unsigned long capacity, unsigned int *cyls, unsigned int *hds,
drivers/scsi/scsi_debug.c renamed from drivers/scsi.org/scsi_debug.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/scsi_debug.c linux-2.6.6/drivers/scsi/scsi_debug.c
@@ -43,7 +43,7 @@
 
 #include <linux/blkdev.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <scsi/scsicam.h>
 
 #include <linux/stat.h>
drivers/scsi/scsi_devinfo.c renamed from drivers/scsi.org/scsi_devinfo.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/scsi_devinfo.c linux-2.6.6/drivers/scsi/scsi_devinfo.c
@@ -9,7 +9,7 @@
 #include <scsi/scsi_devinfo.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "scsi_priv.h"
 
 /*
drivers/scsi/scsi_error.c renamed from drivers/scsi.org/scsi_error.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/scsi_error.c linux-2.6.6/drivers/scsi/scsi_error.c
@@ -26,7 +26,7 @@
 #include <scsi/scsi_ioctl.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 #include "scsi_priv.h"
 #include "scsi_logging.h"
drivers/scsi/scsi_ioctl.c renamed from drivers/scsi.org/scsi_ioctl.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/scsi_ioctl.c linux-2.6.6/drivers/scsi/scsi_ioctl.c
@@ -20,7 +20,7 @@
 
 #include <linux/blkdev.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <scsi/scsi_ioctl.h>
 
 #include "scsi_logging.h"
drivers/scsi/scsi_module.c renamed from drivers/scsi.org/scsi_module.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/scsi_module.c linux-2.6.6/drivers/scsi/scsi_module.c
@@ -12,7 +12,7 @@
 #include <linux/module.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 
 static int __init init_this_scsi_driver(void)
drivers/scsi/scsi_pc98.c renamed from drivers/scsi.org/scsi_pc98.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/scsi_pc98.c linux-2.6.6/drivers/scsi/scsi_pc98.c
@@ -12,7 +12,7 @@
 #include <asm/pc9800.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 
 static int pc98_first_bios_param(struct scsi_device *sdev, int *ip)
drivers/scsi/sd.c renamed from drivers/scsi.org/sd.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/sd.c linux-2.6.6/drivers/scsi/sd.c
@@ -52,7 +52,7 @@
 #include <asm/uaccess.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 #include <scsi/scsi_driver.h>
 #include <scsi/scsi_ioctl.h>
drivers/scsi/seagate.c renamed from drivers/scsi.org/seagate.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/seagate.c linux-2.6.6/drivers/scsi/seagate.c
@@ -103,7 +103,7 @@
 #include <asm/uaccess.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "seagate.h"
 
 #include <scsi/scsi_ioctl.h>
drivers/scsi/sg.c renamed from drivers/scsi.org/sg.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/sg.c linux-2.6.6/drivers/scsi/sg.c
@@ -60,7 +60,7 @@ static int sg_version_num = 30530;	/* 2 
 
 #include <linux/blkdev.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <scsi/scsi_driver.h>
 #include <scsi/scsi_ioctl.h>
 #include <scsi/sg.h>
drivers/scsi/sgiwd93.c renamed from drivers/scsi.org/sgiwd93.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/sgiwd93.c linux-2.6.6/drivers/scsi/sgiwd93.c
@@ -31,7 +31,7 @@
 #include <asm/io.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "wd33c93.h"
 #include "sgiwd93.h"
drivers/scsi/sim710.c renamed from drivers/scsi.org/sim710.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/sim710.c linux-2.6.6/drivers/scsi/sim710.c
@@ -37,7 +37,7 @@
 #include <linux/interrupt.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "53c700.h"
drivers/scsi/sr.c renamed from drivers/scsi.org/sr.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/sr.c linux-2.6.6/drivers/scsi/sr.c
@@ -47,7 +47,7 @@
 #include <asm/uaccess.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 #include <scsi/scsi_driver.h>
 #include <scsi/scsi_ioctl.h>	/* For the door lock/unlock commands */
drivers/scsi/sr_ioctl.c renamed from drivers/scsi.org/sr_ioctl.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/sr_ioctl.c linux-2.6.6/drivers/scsi/sr_ioctl.c
@@ -11,7 +11,7 @@
 #include <asm/uaccess.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <scsi/scsi_ioctl.h>
 
 #include "sr.h"
drivers/scsi/sr_vendor.c renamed from drivers/scsi.org/sr_vendor.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/sr_vendor.c linux-2.6.6/drivers/scsi/sr_vendor.c
@@ -41,7 +41,7 @@
 
 #include <linux/blkdev.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <scsi/scsi_ioctl.h>
 
 #include <linux/cdrom.h>
drivers/scsi/st.c renamed from drivers/scsi.org/st.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/st.c linux-2.6.6/drivers/scsi/st.c
@@ -58,7 +58,7 @@ static char *verstr = "20040403";
 
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 #include <scsi/scsi_driver.h>
 #include <scsi/scsi_ioctl.h>
drivers/scsi/sun3_scsi.c renamed from drivers/scsi.org/sun3_scsi.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/sun3_scsi.c linux-2.6.6/drivers/scsi/sun3_scsi.c
@@ -75,7 +75,7 @@
 #define REAL_DMA
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "sun3_scsi.h"
 #include "NCR5380.h"
drivers/scsi/sun3_scsi_vme.c renamed from drivers/scsi.org/sun3_scsi_vme.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/sun3_scsi_vme.c linux-2.6.6/drivers/scsi/sun3_scsi_vme.c
@@ -41,7 +41,7 @@
 #define REAL_DMA
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "sun3_scsi.h"
 #include "NCR5380.h"
drivers/scsi/sun3x_esp.c renamed from drivers/scsi.org/sun3x_esp.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/sun3x_esp.c linux-2.6.6/drivers/scsi/sun3x_esp.c
@@ -16,7 +16,7 @@
 #include <linux/interrupt.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "NCR53C9x.h"
 
 #include <asm/sun3x.h>
drivers/scsi/sym53c416.c renamed from drivers/scsi.org/sym53c416.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/sym53c416.c linux-2.6.6/drivers/scsi/sym53c416.c
@@ -43,7 +43,7 @@
 #include <linux/blkdev.h>
 #include <linux/isapnp.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "sym53c416.h"
 
 #define VERSION_STRING        "Version 1.0.0-ac"
drivers/scsi/t128.c renamed from drivers/scsi.org/t128.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/t128.c linux-2.6.6/drivers/scsi/t128.c
@@ -118,7 +118,7 @@
 #include <linux/delay.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "t128.h"
 #define AUTOPROBE_IRQ
 #include "NCR5380.h"
drivers/scsi/tmscsim.c renamed from drivers/scsi.org/tmscsim.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/tmscsim.c linux-2.6.6/drivers/scsi/tmscsim.c
@@ -235,7 +235,7 @@
 #include <linux/interrupt.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <linux/stat.h>
 #include <scsi/scsicam.h>
drivers/scsi/u14-34f.c renamed from drivers/scsi.org/u14-34f.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/u14-34f.c linux-2.6.6/drivers/scsi/u14-34f.c
@@ -423,7 +423,7 @@
 #include <linux/spinlock.h>
 #include <scsi/scsicam.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <asm/dma.h>
 #include <asm/irq.h>
drivers/scsi/ultrastor.c renamed from drivers/scsi.org/ultrastor.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/ultrastor.c linux-2.6.6/drivers/scsi/ultrastor.c
@@ -145,7 +145,7 @@
 
 #define ULTRASTOR_PRIVATE	/* Get the private stuff from ultrastor.h */
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "ultrastor.h"
 
 #define FALSE 0
drivers/scsi/wd33c93.c renamed from drivers/scsi.org/wd33c93.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/wd33c93.c linux-2.6.6/drivers/scsi/wd33c93.c
@@ -83,7 +83,7 @@
 #include <asm/irq.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 #include "wd33c93.h"
drivers/scsi/wd7000.c renamed from drivers/scsi.org/wd7000.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/wd7000.c linux-2.6.6/drivers/scsi/wd7000.c
@@ -183,7 +183,7 @@
 #include <asm/io.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <scsi/scsicam.h>
drivers/scsi/zalon.c renamed from drivers/scsi.org/zalon.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/zalon.c linux-2.6.6/drivers/scsi/zalon.c
@@ -24,7 +24,7 @@
 
 #include "../parisc/gsc.h"
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 #include "ncr53c8xx.h"
#1 lore raw
Quoted 88 lines · Arjan van de Ven

diff -purN linux-2.6.6/drivers/scsi.org/ata_piix.c linux-2.6.6/drivers/scsi/ata_piix.c

drivers/scsi/ata_piix.c renamed from drivers/scsi.org/ata_piix.c +1 -1
@@ -28,7 +28,7 @@
 #include <linux/blkdev.h>
 #include <linux/delay.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <linux/libata.h>
 
 #define DRV_NAME	"ata_piix"

diff -purN linux-2.6.6/drivers/scsi.org/sata_promise.c linux-2.6.6/drivers/scsi/sata_promise.c

drivers/scsi/sata_promise.c renamed from drivers/scsi.org/sata_promise.c +1 -1
@@ -34,7 +34,7 @@
 #include <linux/interrupt.h>
 #include <linux/sched.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <linux/libata.h>
 #include <asm/io.h>
 #include "sata_promise.h"

diff -purN linux-2.6.6/drivers/scsi.org/sata_sil.c linux-2.6.6/drivers/scsi/sata_sil.c

drivers/scsi/sata_sil.c renamed from drivers/scsi.org/sata_sil.c +1 -1
@@ -34,7 +34,7 @@
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <linux/libata.h>
 
 #define DRV_NAME	"sata_sil"

diff -purN linux-2.6.6/drivers/scsi.org/sata_sis.c linux-2.6.6/drivers/scsi/sata_sis.c

drivers/scsi/sata_sis.c renamed from drivers/scsi.org/sata_sis.c +1 -1
@@ -34,7 +34,7 @@
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <linux/libata.h>
 
 #define DRV_NAME	"sata_sis"

diff -purN linux-2.6.6/drivers/scsi.org/sata_svw.c linux-2.6.6/drivers/scsi/sata_svw.c

drivers/scsi/sata_svw.c renamed from drivers/scsi.org/sata_svw.c +1 -1
@@ -40,7 +40,7 @@
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <linux/libata.h>
 
 #ifdef CONFIG_PPC_OF

diff -purN linux-2.6.6/drivers/scsi.org/sata_sx4.c linux-2.6.6/drivers/scsi/sata_sx4.c

drivers/scsi/sata_sx4.c renamed from drivers/scsi.org/sata_sx4.c +1 -1
@@ -34,7 +34,7 @@
 #include <linux/interrupt.h>
 #include <linux/sched.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <linux/libata.h>
 #include <asm/io.h>
 #include "sata_promise.h"

diff -purN linux-2.6.6/drivers/scsi.org/sata_via.c linux-2.6.6/drivers/scsi/sata_via.c

drivers/scsi/sata_via.c renamed from drivers/scsi.org/sata_via.c +1 -1
@@ -33,7 +33,7 @@
 #include <linux/blkdev.h>
 #include <linux/delay.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <linux/libata.h>
 #include <asm/io.h>

diff -purN linux-2.6.6/drivers/scsi.org/sata_vsc.c linux-2.6.6/drivers/scsi/sata_vsc.c

drivers/scsi/sata_vsc.c line 28

Quoted 8 lines
drivers/scsi/sata_vsc.c renamed from drivers/scsi.org/sata_vsc.c +1 -1
@@ -22,7 +22,7 @@
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <linux/libata.h>
 
 #define DRV_NAME	"sata_vsc"

Rejected, libata stays with the old headers until 2.7 (when it leaves scsi).

Jeff

author
#2 lore raw
Quoted 2 lines · Jeff Garzik

Rejected, libata stays with the old headers until 2.7 (when it leaves scsi).

why ?

#3 lore raw
Quoted 6 lines · Arjan van de Ven
Quoted 1 line · Jeff Garzik

Rejected, libata stays with the old headers until 2.7 (when it leaves scsi).

why ?

Because I am actively maintaining the 2.4 version of libata.

Jeff

author
#4 lore raw
Quoted 10 lines · Jeff Garzik
Quoted 7 lines · Arjan van de Ven
Quoted 2 lines · Jeff Garzik

Rejected, libata stays with the old headers until 2.7 (when it leaves scsi).

why ?

Because I am actively maintaining the 2.4 version of libata.

... and that involves not fixing 2.6 drivers.... how ?

#5 lore raw
Quoted 10 lines · Arjan van de Ven
Quoted 8 lines · Jeff Garzik
Quoted 6 lines · Arjan van de Ven
Quoted 1 line · Jeff Garzik

Rejected, libata stays with the old headers until 2.7 (when it leaves scsi).

Quoted 6 lines
Quoted 3 lines
Quoted 1 line

why ?

Because I am actively maintaining the 2.4 version of libata.

... and that involves not fixing 2.6 drivers.... how ?

Since you are not the one maintaining libata, you do not have to deal with applying the same patch to 2.4 and 2.6. Every 2.4->2.6 difference in libata increases work I have to do when working on libata.

Jeff

#6 lore raw
In reply to Arjan van de Ven
Quoted 8 lines · Arjan van de Ven
Quoted 7 lines · Jeff Garzik
Quoted 6 lines · Arjan van de Ven
Quoted 2 lines · Jeff Garzik

Rejected, libata stays with the old headers until 2.7 (when it leaves scsi).

Quoted 5 lines
Quoted 3 lines
Quoted 1 line

why ?

Because I am actively maintaining the 2.4 version of libata.

... and that involves not fixing 2.6 drivers.... how ?

For the sake of everyone listening:

core kernel code == specifically tied to kernel major/minor hardware driver code != tied to kernel major/minor

While things like mm/filemap.c are expected to work only in the kernel they belong to, the actual hardware drivers in drivers/* are mostly expected to work in multiple kernel versions. Cleanups to stuff in drivers/* that does *not* take into account other kernel versions is not only counter productive, it's down right rude and inconsiderate to the people who have the job of making sure that their driver works in as many places as possible with as few bugs as possible (obviously, this applies to actively maintained or developed drivers, abandoned drivers you can do whatever you want with since no one's trying to backport any fixes you might make to the driver anyway). The driver world does not equal a single kernel version, don't try and pretend that it does.

Signature · 4 lines
  Doug Ledford <[email protected]>     919-754-3700 x44233
         Red Hat, Inc.
         1801 Varsity Dr.
         Raleigh, NC 27606
#7 lore raw
Quoted 2 lines · Doug Ledford

core kernel code == specifically tied to kernel major/minor hardware driver code != tied to kernel major/minor

In Linux it in fact is. Especially when the subsystem has big changes like scsi in the 2.4->2.6 transition. We need to clean out the letovers, and we want to finish that in early 2.7. Getting these changes in earlier tends to make life much easier, but I'll do another pass once 2.7 is out - if a maintainer wants to reject those changes then his driver will simply break.

author
#8 lore raw
In reply to Jeff Garzik
Quoted 2 lines · Jeff Garzik

Rejected, libata stays with the old headers until 2.7 (when it leaves scsi).

Patch without libata bits below.

drivers/scsi/3w-xxxx.c renamed from drivers/scsi.org/3w-xxxx.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/3w-xxxx.c linux-2.6.6/drivers/scsi/3w-xxxx.c
@@ -220,7 +220,7 @@ MODULE_LICENSE("GPL");
 #define __3W_C			/* let 3w-xxxx.h know it is use */
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 #include "3w-xxxx.h"
drivers/scsi/53c700.c renamed from drivers/scsi.org/53c700.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/53c700.c linux-2.6.6/drivers/scsi/53c700.c
@@ -135,7 +135,7 @@
 #include <linux/interrupt.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 #include <scsi/scsi_transport.h>
 #include <scsi/scsi_transport_spi.h>
drivers/scsi/53c7xx.c renamed from drivers/scsi.org/53c7xx.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/53c7xx.c linux-2.6.6/drivers/scsi/53c7xx.c
@@ -280,7 +280,7 @@
 #endif
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "53c7xx.h"
 #include <linux/stat.h>
 #include <linux/stddef.h>
drivers/scsi/a2091.c renamed from drivers/scsi.org/a2091.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/a2091.c linux-2.6.6/drivers/scsi/a2091.c
@@ -16,7 +16,7 @@
 #include <linux/spinlock.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "wd33c93.h"
 #include "a2091.h"
drivers/scsi/a3000.c renamed from drivers/scsi.org/a3000.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/a3000.c linux-2.6.6/drivers/scsi/a3000.c
@@ -15,7 +15,7 @@
 #include <asm/irq.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "wd33c93.h"
 #include "a3000.h"
drivers/scsi/advansys.c renamed from drivers/scsi.org/advansys.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/advansys.c linux-2.6.6/drivers/scsi/advansys.c
@@ -807,7 +807,7 @@
 #include <asm/dma.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "advansys.h"
 #ifdef CONFIG_PCI
 #include <linux/pci.h>
drivers/scsi/aha1542.c renamed from drivers/scsi.org/aha1542.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/aha1542.c linux-2.6.6/drivers/scsi/aha1542.c
@@ -47,7 +47,7 @@
 #include <asm/io.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "aha1542.h"
 
 #define SCSI_BUF_PA(address)	isa_virt_to_bus(address)
drivers/scsi/aha1740.c renamed from drivers/scsi.org/aha1740.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/aha1740.c linux-2.6.6/drivers/scsi/aha1740.c
@@ -56,7 +56,7 @@
 #include <asm/io.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "aha1740.h"
 
 /* IF YOU ARE HAVING PROBLEMS WITH THIS DRIVER, AND WANT TO WATCH
drivers/scsi/aic7xxx/aic79xx_osm.h renamed from drivers/scsi.org/aic7xxx/aic79xx_osm.h +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/aic7xxx/aic79xx_osm.h linux-2.6.6/drivers/scsi/aic7xxx/aic79xx_osm.h
@@ -68,7 +68,7 @@
 /* Core SCSI definitions */
 #define AIC_LIB_PREFIX ahd
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 /* Name space conflict with BSD queue macros */
 #ifdef LIST_HEAD
drivers/scsi/aic7xxx/aic7xxx_osm.h renamed from drivers/scsi.org/aic7xxx/aic7xxx_osm.h +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/aic7xxx/aic7xxx_osm.h linux-2.6.6/drivers/scsi/aic7xxx/aic7xxx_osm.h
@@ -85,7 +85,7 @@
 /* Core SCSI definitions */
 #define AIC_LIB_PREFIX ahc
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 /* Name space conflict with BSD queue macros */
 #ifdef LIST_HEAD
drivers/scsi/aic7xxx/aiclib.c renamed from drivers/scsi.org/aic7xxx/aiclib.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/aic7xxx/aiclib.c linux-2.6.6/drivers/scsi/aic7xxx/aiclib.c
@@ -36,7 +36,7 @@
 
 /* Core SCSI definitions */
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "aiclib.h"
 #include "cam.h"
drivers/scsi/aic7xxx_old.c renamed from drivers/scsi.org/aic7xxx_old.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/aic7xxx_old.c linux-2.6.6/drivers/scsi/aic7xxx_old.c
@@ -239,7 +239,7 @@
 #include <linux/smp.h>
 #include <linux/interrupt.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "aic7xxx_old/aic7xxx.h"
 
 #include "aic7xxx_old/sequencer.h"
drivers/scsi/amiga7xx.c renamed from drivers/scsi.org/amiga7xx.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/amiga7xx.c linux-2.6.6/drivers/scsi/amiga7xx.c
@@ -25,7 +25,7 @@
 #include <asm/irq.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "53c7xx.h"
 #include "amiga7xx.h"
drivers/scsi/ata_piix.c renamed from drivers/scsi.org/ata_piix.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/ata_piix.c linux-2.6.6/drivers/scsi/ata_piix.c
@@ -28,7 +28,7 @@
 #include <linux/blkdev.h>
 #include <linux/delay.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <linux/libata.h>
 
 #define DRV_NAME	"ata_piix"
drivers/scsi/atari_scsi.c renamed from drivers/scsi.org/atari_scsi.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/atari_scsi.c linux-2.6.6/drivers/scsi/atari_scsi.c
@@ -102,7 +102,7 @@
 #include <asm/bitops.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "atari_scsi.h"
 #include "NCR5380.h"
 #include <asm/atari_stdma.h>
drivers/scsi/atp870u.c renamed from drivers/scsi.org/atp870u.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/atp870u.c linux-2.6.6/drivers/scsi/atp870u.c
@@ -34,7 +34,7 @@
 #include <asm/io.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "atp870u.h"
 
 /*
drivers/scsi/blz1230.c renamed from drivers/scsi.org/blz1230.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/blz1230.c linux-2.6.6/drivers/scsi/blz1230.c
@@ -28,7 +28,7 @@
 #include <linux/interrupt.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "NCR53C9x.h"
 
 #include <linux/zorro.h>
drivers/scsi/blz2060.c renamed from drivers/scsi.org/blz2060.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/blz2060.c linux-2.6.6/drivers/scsi/blz2060.c
@@ -28,7 +28,7 @@
 #include <linux/interrupt.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "NCR53C9x.h"
 
 #include <linux/zorro.h>
drivers/scsi/BusLogic.c renamed from drivers/scsi.org/BusLogic.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/BusLogic.c linux-2.6.6/drivers/scsi/BusLogic.c
@@ -48,7 +48,7 @@
 #include <asm/system.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "BusLogic.h"
 #include "FlashPoint.c"
drivers/scsi/bvme6000.c renamed from drivers/scsi.org/bvme6000.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/bvme6000.c linux-2.6.6/drivers/scsi/bvme6000.c
@@ -17,7 +17,7 @@
 #include <asm/irq.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "53c7xx.h"
 #include "bvme6000.h"
drivers/scsi/constants.c renamed from drivers/scsi.org/constants.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/constants.c linux-2.6.6/drivers/scsi/constants.c
@@ -12,7 +12,7 @@
 #include <linux/blkdev.h>
 #include <linux/kernel.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 #define CONST_COMMAND   0x01
 #define CONST_STATUS    0x02
drivers/scsi/cpqfcTScontrol.c renamed from drivers/scsi.org/cpqfcTScontrol.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/cpqfcTScontrol.c linux-2.6.6/drivers/scsi/cpqfcTScontrol.c
@@ -45,7 +45,7 @@
 #include <linux/spinlock.h>
 
 #include "scsi.h"
-#include "hosts.h"   // Scsi_Host definition for INT handler
+#include <scsi/scsi_host.h>   // Scsi_Host definition for INT handler
 #include "cpqfcTSchip.h"
 #include "cpqfcTSstructs.h"
drivers/scsi/cpqfcTSinit.c renamed from drivers/scsi.org/cpqfcTSinit.c +2 -2
diff -purN linux-2.6.6/drivers/scsi.org/cpqfcTSinit.c linux-2.6.6/drivers/scsi/cpqfcTSinit.c
@@ -51,7 +51,7 @@
 #include <asm/irq.h>
 #include <linux/spinlock.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <scsi/scsi_ioctl.h>
 #include "cpqfcTSchip.h"
 #include "cpqfcTSstructs.h"

@@ -1266,7 +1266,7 @@ static void QueLinkDownCmnd( CPQFCHBA *c
 
 
 
-// The file "hosts.h" says not to call scsi_done from
+// The file <scsi/scsi_host.h> says not to call scsi_done from
 // inside _queuecommand, so we'll do it from the heartbeat timer
 // (clarification: Turns out it's ok to call scsi_done from queuecommand 
 // for cases that don't go to the hardware like scsi cmds destined
drivers/scsi/cpqfcTSworker.c renamed from drivers/scsi.org/cpqfcTSworker.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/cpqfcTSworker.c linux-2.6.6/drivers/scsi/cpqfcTSworker.c
@@ -39,7 +39,7 @@
 #include <asm/dma.h>
 
 #include "scsi.h"
-#include "hosts.h"   // struct Scsi_Host definition for T handler
+#include <scsi/scsi_host.h>   // struct Scsi_Host definition for T handler
 #include "cpqfcTSchip.h"
 #include "cpqfcTSstructs.h"
 #include "cpqfcTStrigger.h"
drivers/scsi/cyberstorm.c renamed from drivers/scsi.org/cyberstorm.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/cyberstorm.c linux-2.6.6/drivers/scsi/cyberstorm.c
@@ -31,7 +31,7 @@
 #include <linux/interrupt.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "NCR53C9x.h"
 
 #include <linux/zorro.h>
drivers/scsi/cyberstormII.c renamed from drivers/scsi.org/cyberstormII.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/cyberstormII.c linux-2.6.6/drivers/scsi/cyberstormII.c
@@ -27,7 +27,7 @@
 #include <linux/interrupt.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "NCR53C9x.h"
 
 #include <linux/zorro.h>
drivers/scsi/dc395x.c renamed from drivers/scsi.org/dc395x.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/dc395x.c linux-2.6.6/drivers/scsi/dc395x.c
@@ -53,7 +53,7 @@
 #include <linux/blkdev.h>
 #include <asm/io.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "dc395x.h"
 #include <scsi/scsicam.h>	/* needed for scsicam_bios_param */
 #include <linux/interrupt.h>
drivers/scsi/dec_esp.c renamed from drivers/scsi.org/dec_esp.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/dec_esp.c linux-2.6.6/drivers/scsi/dec_esp.c
@@ -29,7 +29,7 @@
 #include <linux/stat.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "NCR53C9x.h"
 
 #include <asm/irq.h>
drivers/scsi/dmx3191d.c renamed from drivers/scsi.org/dmx3191d.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/dmx3191d.c linux-2.6.6/drivers/scsi/dmx3191d.c
@@ -34,7 +34,7 @@
 #include <linux/delay.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 #include "dmx3191d.h"
drivers/scsi/dpt_i2o.c renamed from drivers/scsi.org/dpt_i2o.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/dpt_i2o.c linux-2.6.6/drivers/scsi/dpt_i2o.c
@@ -65,7 +65,7 @@ MODULE_DESCRIPTION("Adaptec I2O RAID Dri
 #include <asm/io.h>		/* for virt_to_bus, etc. */
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 #include "dpt/dptsig.h"
 #include "dpti.h"
drivers/scsi/dtc.c renamed from drivers/scsi.org/dtc.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/dtc.c linux-2.6.6/drivers/scsi/dtc.c
@@ -84,7 +84,7 @@
 #include <linux/interrupt.h>
 #include <asm/io.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "dtc.h"
 #define AUTOPROBE_IRQ
 #include "NCR5380.h"
drivers/scsi/eata.c renamed from drivers/scsi.org/eata.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/eata.c linux-2.6.6/drivers/scsi/eata.c
@@ -495,7 +495,7 @@
 #include <linux/spinlock.h>
 #include <scsi/scsicam.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <asm/dma.h>
 #include <asm/irq.h>
drivers/scsi/eata_pio.c renamed from drivers/scsi.org/eata_pio.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/eata_pio.c linux-2.6.6/drivers/scsi/eata_pio.c
@@ -63,7 +63,7 @@
 #include <asm/io.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <scsi/scsicam.h>
 
 #include "eata_generic.h"
drivers/scsi/esp.c renamed from drivers/scsi.org/esp.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/esp.c linux-2.6.6/drivers/scsi/esp.c
@@ -27,7 +27,7 @@
 #include <linux/interrupt.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "esp.h"
 
 #include <asm/sbus.h>
drivers/scsi/fastlane.c renamed from drivers/scsi.org/fastlane.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/fastlane.c linux-2.6.6/drivers/scsi/fastlane.c
@@ -36,7 +36,7 @@
 #include <linux/interrupt.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "NCR53C9x.h"
 
 #include <linux/zorro.h>
drivers/scsi/fcal.c renamed from drivers/scsi.org/fcal.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/fcal.c linux-2.6.6/drivers/scsi/fcal.c
@@ -21,7 +21,7 @@
 #include <asm/irq.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "../fc4/fcp_impl.h"
 #include "fcal.h"
drivers/scsi/fd_mcs.c renamed from drivers/scsi.org/fd_mcs.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/fd_mcs.c linux-2.6.6/drivers/scsi/fd_mcs.c
@@ -93,7 +93,7 @@
 #include <asm/system.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "fd_mcs.h"
 
 #define DRIVER_VERSION "v0.2 by ZP Gu<[email protected]>"
drivers/scsi/fdomain.c renamed from drivers/scsi.org/fdomain.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/fdomain.c linux-2.6.6/drivers/scsi/fdomain.c
@@ -284,7 +284,7 @@
 #include <asm/system.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 MODULE_AUTHOR("Rickard E. Faith");
 MODULE_DESCRIPTION("Future domain SCSI driver");
drivers/scsi/g_NCR5380.c renamed from drivers/scsi.org/g_NCR5380.c +1 -1
@@ -107,7 +107,7 @@
 #include <linux/sched.h>
 #include <linux/blkdev.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "g_NCR5380.h"
 #include "NCR5380.h"
 #include <linux/stat.h>
drivers/scsi/gvp11.c renamed from drivers/scsi.org/gvp11.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/gvp11.c linux-2.6.6/drivers/scsi/gvp11.c
@@ -16,7 +16,7 @@
 #include <linux/spinlock.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "wd33c93.h"
 #include "gvp11.h"
drivers/scsi/i60uscsi.c renamed from drivers/scsi.org/i60uscsi.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/i60uscsi.c linux-2.6.6/drivers/scsi/i60uscsi.c
@@ -81,7 +81,7 @@
 #include <asm/io.h>
 #include <linux/blkdev.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "inia100.h"
 
 #define JIFFIES_TO_MS(t) ((t) * 1000 / HZ)
drivers/scsi/ibmmca.c renamed from drivers/scsi.org/ibmmca.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/ibmmca.c linux-2.6.6/drivers/scsi/ibmmca.c
@@ -45,7 +45,7 @@
 #include <asm/io.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "ibmmca.h"
 
 /* current version of this driver-source: */
drivers/scsi/ide-scsi.c renamed from drivers/scsi.org/ide-scsi.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/ide-scsi.c linux-2.6.6/drivers/scsi/ide-scsi.c
@@ -51,7 +51,7 @@
 #include <asm/uaccess.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <scsi/sg.h>
 
 #define IDESCSI_DEBUG_LOG		0
drivers/scsi/imm.h renamed from drivers/scsi.org/imm.h +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/imm.h linux-2.6.6/drivers/scsi/imm.h
@@ -79,7 +79,7 @@
 #include  <linux/interrupt.h>
 
 #include  <asm/io.h>
-#include  "hosts.h"
+#include  <scsi/scsi_host.h>
 /* batteries not included :-) */
 
 /*
drivers/scsi/in2000.c renamed from drivers/scsi.org/in2000.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/in2000.c linux-2.6.6/drivers/scsi/in2000.c
@@ -126,7 +126,7 @@
 #include <asm/system.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 #define IN2000_VERSION    "1.33-2.5"
 #define IN2000_DATE       "2002/11/03"
drivers/scsi/ini9100u.c renamed from drivers/scsi.org/ini9100u.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/ini9100u.c linux-2.6.6/drivers/scsi/ini9100u.c
@@ -136,7 +136,7 @@
 #include <asm/io.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "ini9100u.h"
 
 #ifdef DEBUG_i91u
drivers/scsi/ips.c renamed from drivers/scsi.org/ips.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/ips.c linux-2.6.6/drivers/scsi/ips.c
@@ -176,7 +176,7 @@
 #include <scsi/sg.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "ips.h"
 
 #include <linux/module.h>
drivers/scsi/jazz_esp.c renamed from drivers/scsi.org/jazz_esp.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/jazz_esp.c linux-2.6.6/drivers/scsi/jazz_esp.c
@@ -16,7 +16,7 @@
 #include <linux/stat.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "NCR53C9x.h"
 
 #include <asm/irq.h>
drivers/scsi/lasi700.c renamed from drivers/scsi.org/lasi700.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/lasi700.c linux-2.6.6/drivers/scsi/lasi700.c
@@ -50,7 +50,7 @@
 #include <asm/delay.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 #include "lasi700.h"
 #include "53c700.h"
drivers/scsi/libata-core.c renamed from drivers/scsi.org/libata-core.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/libata-core.c linux-2.6.6/drivers/scsi/libata-core.c
@@ -39,7 +39,7 @@
 #include <linux/workqueue.h>
 #include <scsi/scsi.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <linux/libata.h>
 #include <asm/io.h>
 #include <asm/semaphore.h>
drivers/scsi/libata-scsi.c renamed from drivers/scsi.org/libata-scsi.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/libata-scsi.c linux-2.6.6/drivers/scsi/libata-scsi.c
@@ -27,7 +27,7 @@
 #include <linux/spinlock.h>
 #include <scsi/scsi.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <linux/libata.h>
 
 #include "libata.h"
drivers/scsi/mac_esp.c renamed from drivers/scsi.org/mac_esp.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/mac_esp.c linux-2.6.6/drivers/scsi/mac_esp.c
@@ -26,7 +26,7 @@
 #include <linux/interrupt.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "NCR53C9x.h"
 
 #include <asm/io.h>
drivers/scsi/mac_scsi.c renamed from drivers/scsi.org/mac_scsi.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/mac_scsi.c linux-2.6.6/drivers/scsi/mac_scsi.c
@@ -52,7 +52,7 @@
 #include <asm/mac_via.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "mac_scsi.h"
 #include "NCR5380.h"
drivers/scsi/mca_53c9x.c renamed from drivers/scsi.org/mca_53c9x.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/mca_53c9x.c linux-2.6.6/drivers/scsi/mca_53c9x.c
@@ -43,7 +43,7 @@
 #include <linux/mca-legacy.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "NCR53C9x.h"
 
 #include <asm/dma.h>
drivers/scsi/megaraid.c renamed from drivers/scsi.org/megaraid.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/megaraid.c linux-2.6.6/drivers/scsi/megaraid.c
@@ -49,7 +49,7 @@
 #include <scsi/scsicam.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 #include "megaraid.h"
drivers/scsi/mvme147.c renamed from drivers/scsi.org/mvme147.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/mvme147.c linux-2.6.6/drivers/scsi/mvme147.c
@@ -11,7 +11,7 @@
 #include <asm/irq.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "wd33c93.h"
 #include "mvme147.h"
drivers/scsi/mvme16x.c renamed from drivers/scsi.org/mvme16x.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/mvme16x.c linux-2.6.6/drivers/scsi/mvme16x.c
@@ -15,7 +15,7 @@
 #include <asm/irq.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "53c7xx.h"
 #include "mvme16x.h"
drivers/scsi/NCR53c406a.c renamed from drivers/scsi.org/NCR53c406a.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/NCR53c406a.c linux-2.6.6/drivers/scsi/NCR53c406a.c
@@ -54,7 +54,7 @@
 #include <linux/blkdev.h>
 #include <linux/spinlock.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 /* ============================================================= */
drivers/scsi/ncr53c8xx.c renamed from drivers/scsi.org/ncr53c8xx.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/ncr53c8xx.c linux-2.6.6/drivers/scsi/ncr53c8xx.c
@@ -138,7 +138,7 @@
 #include <asm/system.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 #include "ncr53c8xx.h"
drivers/scsi/NCR53C9x.c renamed from drivers/scsi.org/NCR53C9x.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/NCR53C9x.c linux-2.6.6/drivers/scsi/NCR53C9x.c
@@ -36,7 +36,7 @@
 #include <linux/init.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "NCR53C9x.h"
 
 #include <asm/system.h>
drivers/scsi/NCR_D700.c renamed from drivers/scsi.org/NCR_D700.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/NCR_D700.c linux-2.6.6/drivers/scsi/NCR_D700.c
@@ -100,7 +100,7 @@
 #include <asm/io.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 #include "53c700.h"
 #include "NCR_D700.h"
drivers/scsi/NCR_Q720.c renamed from drivers/scsi.org/NCR_Q720.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/NCR_Q720.c linux-2.6.6/drivers/scsi/NCR_Q720.c
@@ -16,7 +16,7 @@
 #include <asm/io.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 #include "ncr53c8xx.h"
drivers/scsi/nsp32.c renamed from drivers/scsi.org/nsp32.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/nsp32.c linux-2.6.6/drivers/scsi/nsp32.c
@@ -45,7 +45,7 @@
 #include <asm/io.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <scsi/scsi_ioctl.h>
 #include <scsi/scsi.h>
drivers/scsi/oktagon_esp.c renamed from drivers/scsi.org/oktagon_esp.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/oktagon_esp.c linux-2.6.6/drivers/scsi/oktagon_esp.c
@@ -29,7 +29,7 @@
 
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "NCR53C9x.h"
 
 #include <linux/zorro.h>
drivers/scsi/osst.c renamed from drivers/scsi.org/osst.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/osst.c linux-2.6.6/drivers/scsi/osst.c
@@ -61,7 +61,7 @@ const char * osst_version = "0.99.1";
 #define OSST_DEB_MSG  KERN_NOTICE
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <scsi/scsi_driver.h>
 #include <scsi/scsi_ioctl.h>
drivers/scsi/pas16.c renamed from drivers/scsi.org/pas16.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/pas16.c linux-2.6.6/drivers/scsi/pas16.c
@@ -125,7 +125,7 @@
 #include <linux/init.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "pas16.h"
 #define AUTOPROBE_IRQ
 #include "NCR5380.h"
drivers/scsi/pc980155.c renamed from drivers/scsi.org/pc980155.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/pc980155.c linux-2.6.6/drivers/scsi/pc980155.c
@@ -20,7 +20,7 @@
 #include <asm/dma.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "wd33c93.h"
 #include "pc980155.h"
drivers/scsi/pci2000.c renamed from drivers/scsi.org/pci2000.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/pci2000.c linux-2.6.6/drivers/scsi/pci2000.c
@@ -54,7 +54,7 @@
 #include <asm/io.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "pci2000.h"
 #include "psi_roy.h"
drivers/scsi/pci2220i.c renamed from drivers/scsi.org/pci2220i.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/pci2220i.c linux-2.6.6/drivers/scsi/pci2220i.c
@@ -59,7 +59,7 @@
 #include <asm/io.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "pci2220i.h"
 #include "psi_dale.h"
drivers/scsi/pcmcia/aha152x_stub.c renamed from drivers/scsi.org/pcmcia/aha152x_stub.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/pcmcia/aha152x_stub.c linux-2.6.6/drivers/scsi/pcmcia/aha152x_stub.c
@@ -47,7 +47,7 @@
 #include <scsi/scsi_ioctl.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "aha152x.h"
 
 #include <pcmcia/version.h>
drivers/scsi/pcmcia/fdomain_stub.c renamed from drivers/scsi.org/pcmcia/fdomain_stub.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/pcmcia/fdomain_stub.c linux-2.6.6/drivers/scsi/pcmcia/fdomain_stub.c
@@ -44,7 +44,7 @@
 #include <scsi/scsi_ioctl.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 #include <pcmcia/version.h>
 #include <pcmcia/cs_types.h>
drivers/scsi/pcmcia/qlogic_stub.c renamed from drivers/scsi.org/pcmcia/qlogic_stub.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/pcmcia/qlogic_stub.c linux-2.6.6/drivers/scsi/pcmcia/qlogic_stub.c
@@ -46,7 +46,7 @@
 #include <linux/interrupt.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "../qlogicfas408.h"
 
 #include <pcmcia/version.h>
drivers/scsi/pluto.c renamed from drivers/scsi.org/pluto.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/pluto.c linux-2.6.6/drivers/scsi/pluto.c
@@ -21,7 +21,7 @@
 #include <asm/irq.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "../fc4/fcp_impl.h"
 #include "pluto.h"
drivers/scsi/ppa.h renamed from drivers/scsi.org/ppa.h +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/ppa.h linux-2.6.6/drivers/scsi/ppa.h
@@ -86,7 +86,7 @@
 #include  <linux/interrupt.h>
 
 #include  <asm/io.h>
-#include  "hosts.h"
+#include  <scsi/scsi_host.h>
 /* batteries not included :-) */
 
 /*
drivers/scsi/psi240i.c renamed from drivers/scsi.org/psi240i.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/psi240i.c linux-2.6.6/drivers/scsi/psi240i.c
@@ -41,7 +41,7 @@
 #include <asm/system.h>
 #include <asm/io.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 #include "psi240i.h"
 #include "psi_chip.h"
drivers/scsi/qla1280.c renamed from drivers/scsi.org/qla1280.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/qla1280.c linux-2.6.6/drivers/scsi/qla1280.c
@@ -357,7 +357,7 @@
 #else
 #include <linux/blk.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "sd.h"
 #endif
drivers/scsi/qla2xxx/qla_os.h renamed from drivers/scsi.org/qla2xxx/qla_os.h +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/qla2xxx/qla_os.h linux-2.6.6/drivers/scsi/qla2xxx/qla_os.h
@@ -59,7 +59,7 @@
 #include <asm/uaccess.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 #include <scsi/scsicam.h>
 #include <scsi/scsi_ioctl.h>
drivers/scsi/qlogicfas408.c renamed from drivers/scsi.org/qlogicfas408.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/qlogicfas408.c linux-2.6.6/drivers/scsi/qlogicfas408.c
@@ -56,7 +56,7 @@
 #include <asm/dma.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "qlogicfas408.h"
 
 /*----------------------------------------------------------------*/
drivers/scsi/qlogicfas.c renamed from drivers/scsi.org/qlogicfas.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/qlogicfas.c linux-2.6.6/drivers/scsi/qlogicfas.c
@@ -32,7 +32,7 @@
 #include <asm/dma.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "qlogicfas408.h"
 
 /* Set the following to 2 to use normal interrupt (active high/totempole-
drivers/scsi/qlogicfc.c renamed from drivers/scsi.org/qlogicfc.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/qlogicfc.c linux-2.6.6/drivers/scsi/qlogicfc.c
@@ -64,7 +64,7 @@
 #include <asm/io.h>
 #include <asm/irq.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 #define pci64_dma_hi32(a) ((u32) (0xffffffff & (((u64)(a))>>32)))
 #define pci64_dma_lo32(a) ((u32) (0xffffffff & (((u64)(a)))))
drivers/scsi/qlogicisp.c renamed from drivers/scsi.org/qlogicisp.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/qlogicisp.c linux-2.6.6/drivers/scsi/qlogicisp.c
@@ -36,7 +36,7 @@
 #include <asm/irq.h>
 #include <asm/byteorder.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "qlogicisp.h"
 
 /* Configuration section *****************************************************/
drivers/scsi/qlogicpti.c renamed from drivers/scsi.org/qlogicpti.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/qlogicpti.c linux-2.6.6/drivers/scsi/qlogicpti.c
@@ -27,7 +27,7 @@
 #include <asm/byteorder.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "qlogicpti.h"
 
 #include <asm/sbus.h>
drivers/scsi/scsicam.c renamed from drivers/scsi.org/scsicam.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/scsicam.c linux-2.6.6/drivers/scsi/scsicam.c
@@ -19,7 +19,7 @@
 #include <linux/buffer_head.h>
 #include <asm/unaligned.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <scsi/scsicam.h>
 
 static int setsize(unsigned long capacity, unsigned int *cyls, unsigned int *hds,
drivers/scsi/scsi_debug.c renamed from drivers/scsi.org/scsi_debug.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/scsi_debug.c linux-2.6.6/drivers/scsi/scsi_debug.c
@@ -43,7 +43,7 @@
 
 #include <linux/blkdev.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <scsi/scsicam.h>
 
 #include <linux/stat.h>
drivers/scsi/scsi_devinfo.c renamed from drivers/scsi.org/scsi_devinfo.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/scsi_devinfo.c linux-2.6.6/drivers/scsi/scsi_devinfo.c
@@ -9,7 +9,7 @@
 #include <scsi/scsi_devinfo.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "scsi_priv.h"
 
 /*
drivers/scsi/scsi_error.c renamed from drivers/scsi.org/scsi_error.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/scsi_error.c linux-2.6.6/drivers/scsi/scsi_error.c
@@ -26,7 +26,7 @@
 #include <scsi/scsi_ioctl.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 #include "scsi_priv.h"
 #include "scsi_logging.h"
drivers/scsi/scsi_ioctl.c renamed from drivers/scsi.org/scsi_ioctl.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/scsi_ioctl.c linux-2.6.6/drivers/scsi/scsi_ioctl.c
@@ -20,7 +20,7 @@
 
 #include <linux/blkdev.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <scsi/scsi_ioctl.h>
 
 #include "scsi_logging.h"
drivers/scsi/scsi_module.c renamed from drivers/scsi.org/scsi_module.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/scsi_module.c linux-2.6.6/drivers/scsi/scsi_module.c
@@ -12,7 +12,7 @@
 #include <linux/module.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 
 static int __init init_this_scsi_driver(void)
drivers/scsi/scsi_pc98.c renamed from drivers/scsi.org/scsi_pc98.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/scsi_pc98.c linux-2.6.6/drivers/scsi/scsi_pc98.c
@@ -12,7 +12,7 @@
 #include <asm/pc9800.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 
 static int pc98_first_bios_param(struct scsi_device *sdev, int *ip)
drivers/scsi/sd.c renamed from drivers/scsi.org/sd.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/sd.c linux-2.6.6/drivers/scsi/sd.c
@@ -52,7 +52,7 @@
 #include <asm/uaccess.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 #include <scsi/scsi_driver.h>
 #include <scsi/scsi_ioctl.h>
drivers/scsi/seagate.c renamed from drivers/scsi.org/seagate.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/seagate.c linux-2.6.6/drivers/scsi/seagate.c
@@ -103,7 +103,7 @@
 #include <asm/uaccess.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "seagate.h"
 
 #include <scsi/scsi_ioctl.h>
drivers/scsi/sg.c renamed from drivers/scsi.org/sg.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/sg.c linux-2.6.6/drivers/scsi/sg.c
@@ -60,7 +60,7 @@ static int sg_version_num = 30530;	/* 2 
 
 #include <linux/blkdev.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <scsi/scsi_driver.h>
 #include <scsi/scsi_ioctl.h>
 #include <scsi/sg.h>
drivers/scsi/sgiwd93.c renamed from drivers/scsi.org/sgiwd93.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/sgiwd93.c linux-2.6.6/drivers/scsi/sgiwd93.c
@@ -31,7 +31,7 @@
 #include <asm/io.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "wd33c93.h"
 #include "sgiwd93.h"
drivers/scsi/sim710.c renamed from drivers/scsi.org/sim710.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/sim710.c linux-2.6.6/drivers/scsi/sim710.c
@@ -37,7 +37,7 @@
 #include <linux/interrupt.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "53c700.h"
drivers/scsi/sr.c renamed from drivers/scsi.org/sr.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/sr.c linux-2.6.6/drivers/scsi/sr.c
@@ -47,7 +47,7 @@
 #include <asm/uaccess.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 #include <scsi/scsi_driver.h>
 #include <scsi/scsi_ioctl.h>	/* For the door lock/unlock commands */
drivers/scsi/sr_ioctl.c renamed from drivers/scsi.org/sr_ioctl.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/sr_ioctl.c linux-2.6.6/drivers/scsi/sr_ioctl.c
@@ -11,7 +11,7 @@
 #include <asm/uaccess.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <scsi/scsi_ioctl.h>
 
 #include "sr.h"
drivers/scsi/sr_vendor.c renamed from drivers/scsi.org/sr_vendor.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/sr_vendor.c linux-2.6.6/drivers/scsi/sr_vendor.c
@@ -41,7 +41,7 @@
 
 #include <linux/blkdev.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <scsi/scsi_ioctl.h>
 
 #include <linux/cdrom.h>
drivers/scsi/st.c renamed from drivers/scsi.org/st.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/st.c linux-2.6.6/drivers/scsi/st.c
@@ -58,7 +58,7 @@ static char *verstr = "20040403";
 
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 #include <scsi/scsi_driver.h>
 #include <scsi/scsi_ioctl.h>
drivers/scsi/sun3_scsi.c renamed from drivers/scsi.org/sun3_scsi.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/sun3_scsi.c linux-2.6.6/drivers/scsi/sun3_scsi.c
@@ -75,7 +75,7 @@
 #define REAL_DMA
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "sun3_scsi.h"
 #include "NCR5380.h"
drivers/scsi/sun3_scsi_vme.c renamed from drivers/scsi.org/sun3_scsi_vme.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/sun3_scsi_vme.c linux-2.6.6/drivers/scsi/sun3_scsi_vme.c
@@ -41,7 +41,7 @@
 #define REAL_DMA
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "sun3_scsi.h"
 #include "NCR5380.h"
drivers/scsi/sun3x_esp.c renamed from drivers/scsi.org/sun3x_esp.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/sun3x_esp.c linux-2.6.6/drivers/scsi/sun3x_esp.c
@@ -16,7 +16,7 @@
 #include <linux/interrupt.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "NCR53C9x.h"
 
 #include <asm/sun3x.h>
drivers/scsi/sym53c416.c renamed from drivers/scsi.org/sym53c416.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/sym53c416.c linux-2.6.6/drivers/scsi/sym53c416.c
@@ -43,7 +43,7 @@
 #include <linux/blkdev.h>
 #include <linux/isapnp.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "sym53c416.h"
 
 #define VERSION_STRING        "Version 1.0.0-ac"
drivers/scsi/t128.c renamed from drivers/scsi.org/t128.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/t128.c linux-2.6.6/drivers/scsi/t128.c
@@ -118,7 +118,7 @@
 #include <linux/delay.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "t128.h"
 #define AUTOPROBE_IRQ
 #include "NCR5380.h"
drivers/scsi/tmscsim.c renamed from drivers/scsi.org/tmscsim.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/tmscsim.c linux-2.6.6/drivers/scsi/tmscsim.c
@@ -235,7 +235,7 @@
 #include <linux/interrupt.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <linux/stat.h>
 #include <scsi/scsicam.h>
drivers/scsi/u14-34f.c renamed from drivers/scsi.org/u14-34f.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/u14-34f.c linux-2.6.6/drivers/scsi/u14-34f.c
@@ -423,7 +423,7 @@
 #include <linux/spinlock.h>
 #include <scsi/scsicam.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <asm/dma.h>
 #include <asm/irq.h>
drivers/scsi/ultrastor.c renamed from drivers/scsi.org/ultrastor.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/ultrastor.c linux-2.6.6/drivers/scsi/ultrastor.c
@@ -145,7 +145,7 @@
 
 #define ULTRASTOR_PRIVATE	/* Get the private stuff from ultrastor.h */
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "ultrastor.h"
 
 #define FALSE 0
drivers/scsi/wd33c93.c renamed from drivers/scsi.org/wd33c93.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/wd33c93.c linux-2.6.6/drivers/scsi/wd33c93.c
@@ -83,7 +83,7 @@
 #include <asm/irq.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 #include "wd33c93.h"
drivers/scsi/wd7000.c renamed from drivers/scsi.org/wd7000.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/wd7000.c linux-2.6.6/drivers/scsi/wd7000.c
@@ -183,7 +183,7 @@
 #include <asm/io.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <scsi/scsicam.h>
drivers/scsi/zalon.c renamed from drivers/scsi.org/zalon.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/zalon.c linux-2.6.6/drivers/scsi/zalon.c
@@ -24,7 +24,7 @@
 
 #include "../parisc/gsc.h"
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 #include "ncr53c8xx.h"
#9 lore raw
Quoted 6 lines · Arjan van de Ven
Quoted 1 line · Jeff Garzik

Rejected, libata stays with the old headers until 2.7 (when it leaves scsi).

Patch without libata bits below.

Bullshit, and therefore, rejected again.

Quoted 11 lines

diff -purN linux-2.6.6/drivers/scsi.org/ata_piix.c linux-2.6.6/drivers/scsi/ata_piix.c

drivers/scsi/ata_piix.c renamed from drivers/scsi.org/ata_piix.c +0 -0

diff -purN linux-2.6.6/drivers/scsi.org/libata-core.c linux-2.6.6/drivers/scsi/libata-core.c

drivers/scsi/libata-core.c renamed from drivers/scsi.org/libata-core.c +0 -0

diff -purN linux-2.6.6/drivers/scsi.org/libata-scsi.c linux-2.6.6/drivers/scsi/libata-scsi.c

drivers/scsi/libata-scsi.c renamed from drivers/scsi.org/libata-scsi.c +0 -0
author
#10 lore raw
Quoted 11 lines · Jeff Garzik
Quoted 7 lines · Arjan van de Ven
Quoted 2 lines · Jeff Garzik

Rejected, libata stays with the old headers until 2.7 (when it leaves scsi).

Patch without libata bits below.

Bullshit, and therefore, rejected again.

Would you consider naming your files more consistently ? They don't all have sata in them ;(
(Or even move them to their own directory)

drivers/scsi/3w-xxxx.c renamed from drivers/scsi.org/3w-xxxx.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/3w-xxxx.c linux-2.6.6/drivers/scsi/3w-xxxx.c
@@ -220,7 +220,7 @@ MODULE_LICENSE("GPL");
 #define __3W_C			/* let 3w-xxxx.h know it is use */
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 #include "3w-xxxx.h"
drivers/scsi/53c700.c renamed from drivers/scsi.org/53c700.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/53c700.c linux-2.6.6/drivers/scsi/53c700.c
@@ -135,7 +135,7 @@
 #include <linux/interrupt.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 #include <scsi/scsi_transport.h>
 #include <scsi/scsi_transport_spi.h>
drivers/scsi/53c7xx.c renamed from drivers/scsi.org/53c7xx.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/53c7xx.c linux-2.6.6/drivers/scsi/53c7xx.c
@@ -280,7 +280,7 @@
 #endif
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "53c7xx.h"
 #include <linux/stat.h>
 #include <linux/stddef.h>
drivers/scsi/a2091.c renamed from drivers/scsi.org/a2091.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/a2091.c linux-2.6.6/drivers/scsi/a2091.c
@@ -16,7 +16,7 @@
 #include <linux/spinlock.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "wd33c93.h"
 #include "a2091.h"
drivers/scsi/a3000.c renamed from drivers/scsi.org/a3000.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/a3000.c linux-2.6.6/drivers/scsi/a3000.c
@@ -15,7 +15,7 @@
 #include <asm/irq.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "wd33c93.h"
 #include "a3000.h"
drivers/scsi/advansys.c renamed from drivers/scsi.org/advansys.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/advansys.c linux-2.6.6/drivers/scsi/advansys.c
@@ -807,7 +807,7 @@
 #include <asm/dma.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "advansys.h"
 #ifdef CONFIG_PCI
 #include <linux/pci.h>
drivers/scsi/aha1542.c renamed from drivers/scsi.org/aha1542.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/aha1542.c linux-2.6.6/drivers/scsi/aha1542.c
@@ -47,7 +47,7 @@
 #include <asm/io.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "aha1542.h"
 
 #define SCSI_BUF_PA(address)	isa_virt_to_bus(address)
drivers/scsi/aha1740.c renamed from drivers/scsi.org/aha1740.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/aha1740.c linux-2.6.6/drivers/scsi/aha1740.c
@@ -56,7 +56,7 @@
 #include <asm/io.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "aha1740.h"
 
 /* IF YOU ARE HAVING PROBLEMS WITH THIS DRIVER, AND WANT TO WATCH
drivers/scsi/aic7xxx/aic79xx_osm.h renamed from drivers/scsi.org/aic7xxx/aic79xx_osm.h +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/aic7xxx/aic79xx_osm.h linux-2.6.6/drivers/scsi/aic7xxx/aic79xx_osm.h
@@ -68,7 +68,7 @@
 /* Core SCSI definitions */
 #define AIC_LIB_PREFIX ahd
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 /* Name space conflict with BSD queue macros */
 #ifdef LIST_HEAD
drivers/scsi/aic7xxx/aic7xxx_osm.h renamed from drivers/scsi.org/aic7xxx/aic7xxx_osm.h +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/aic7xxx/aic7xxx_osm.h linux-2.6.6/drivers/scsi/aic7xxx/aic7xxx_osm.h
@@ -85,7 +85,7 @@
 /* Core SCSI definitions */
 #define AIC_LIB_PREFIX ahc
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 /* Name space conflict with BSD queue macros */
 #ifdef LIST_HEAD
drivers/scsi/aic7xxx/aiclib.c renamed from drivers/scsi.org/aic7xxx/aiclib.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/aic7xxx/aiclib.c linux-2.6.6/drivers/scsi/aic7xxx/aiclib.c
@@ -36,7 +36,7 @@
 
 /* Core SCSI definitions */
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "aiclib.h"
 #include "cam.h"
drivers/scsi/aic7xxx_old.c renamed from drivers/scsi.org/aic7xxx_old.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/aic7xxx_old.c linux-2.6.6/drivers/scsi/aic7xxx_old.c
@@ -239,7 +239,7 @@
 #include <linux/smp.h>
 #include <linux/interrupt.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "aic7xxx_old/aic7xxx.h"
 
 #include "aic7xxx_old/sequencer.h"
drivers/scsi/amiga7xx.c renamed from drivers/scsi.org/amiga7xx.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/amiga7xx.c linux-2.6.6/drivers/scsi/amiga7xx.c
@@ -25,7 +25,7 @@
 #include <asm/irq.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "53c7xx.h"
 #include "amiga7xx.h"
drivers/scsi/atari_scsi.c renamed from drivers/scsi.org/atari_scsi.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/atari_scsi.c linux-2.6.6/drivers/scsi/atari_scsi.c
@@ -102,7 +102,7 @@
 #include <asm/bitops.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "atari_scsi.h"
 #include "NCR5380.h"
 #include <asm/atari_stdma.h>
drivers/scsi/atp870u.c renamed from drivers/scsi.org/atp870u.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/atp870u.c linux-2.6.6/drivers/scsi/atp870u.c
@@ -34,7 +34,7 @@
 #include <asm/io.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "atp870u.h"
 
 /*
drivers/scsi/blz1230.c renamed from drivers/scsi.org/blz1230.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/blz1230.c linux-2.6.6/drivers/scsi/blz1230.c
@@ -28,7 +28,7 @@
 #include <linux/interrupt.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "NCR53C9x.h"
 
 #include <linux/zorro.h>
drivers/scsi/blz2060.c renamed from drivers/scsi.org/blz2060.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/blz2060.c linux-2.6.6/drivers/scsi/blz2060.c
@@ -28,7 +28,7 @@
 #include <linux/interrupt.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "NCR53C9x.h"
 
 #include <linux/zorro.h>
drivers/scsi/BusLogic.c renamed from drivers/scsi.org/BusLogic.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/BusLogic.c linux-2.6.6/drivers/scsi/BusLogic.c
@@ -48,7 +48,7 @@
 #include <asm/system.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "BusLogic.h"
 #include "FlashPoint.c"
drivers/scsi/bvme6000.c renamed from drivers/scsi.org/bvme6000.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/bvme6000.c linux-2.6.6/drivers/scsi/bvme6000.c
@@ -17,7 +17,7 @@
 #include <asm/irq.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "53c7xx.h"
 #include "bvme6000.h"
drivers/scsi/constants.c renamed from drivers/scsi.org/constants.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/constants.c linux-2.6.6/drivers/scsi/constants.c
@@ -12,7 +12,7 @@
 #include <linux/blkdev.h>
 #include <linux/kernel.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 #define CONST_COMMAND   0x01
 #define CONST_STATUS    0x02
drivers/scsi/cpqfcTScontrol.c renamed from drivers/scsi.org/cpqfcTScontrol.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/cpqfcTScontrol.c linux-2.6.6/drivers/scsi/cpqfcTScontrol.c
@@ -45,7 +45,7 @@
 #include <linux/spinlock.h>
 
 #include "scsi.h"
-#include "hosts.h"   // Scsi_Host definition for INT handler
+#include <scsi/scsi_host.h>   // Scsi_Host definition for INT handler
 #include "cpqfcTSchip.h"
 #include "cpqfcTSstructs.h"
drivers/scsi/cpqfcTSinit.c renamed from drivers/scsi.org/cpqfcTSinit.c +2 -2
diff -purN linux-2.6.6/drivers/scsi.org/cpqfcTSinit.c linux-2.6.6/drivers/scsi/cpqfcTSinit.c
@@ -51,7 +51,7 @@
 #include <asm/irq.h>
 #include <linux/spinlock.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <scsi/scsi_ioctl.h>
 #include "cpqfcTSchip.h"
 #include "cpqfcTSstructs.h"

@@ -1266,7 +1266,7 @@ static void QueLinkDownCmnd( CPQFCHBA *c
 
 
 
-// The file "hosts.h" says not to call scsi_done from
+// The file <scsi/scsi_host.h> says not to call scsi_done from
 // inside _queuecommand, so we'll do it from the heartbeat timer
 // (clarification: Turns out it's ok to call scsi_done from queuecommand 
 // for cases that don't go to the hardware like scsi cmds destined
drivers/scsi/cpqfcTSworker.c renamed from drivers/scsi.org/cpqfcTSworker.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/cpqfcTSworker.c linux-2.6.6/drivers/scsi/cpqfcTSworker.c
@@ -39,7 +39,7 @@
 #include <asm/dma.h>
 
 #include "scsi.h"
-#include "hosts.h"   // struct Scsi_Host definition for T handler
+#include <scsi/scsi_host.h>   // struct Scsi_Host definition for T handler
 #include "cpqfcTSchip.h"
 #include "cpqfcTSstructs.h"
 #include "cpqfcTStrigger.h"
drivers/scsi/cyberstorm.c renamed from drivers/scsi.org/cyberstorm.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/cyberstorm.c linux-2.6.6/drivers/scsi/cyberstorm.c
@@ -31,7 +31,7 @@
 #include <linux/interrupt.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "NCR53C9x.h"
 
 #include <linux/zorro.h>
drivers/scsi/cyberstormII.c renamed from drivers/scsi.org/cyberstormII.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/cyberstormII.c linux-2.6.6/drivers/scsi/cyberstormII.c
@@ -27,7 +27,7 @@
 #include <linux/interrupt.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "NCR53C9x.h"
 
 #include <linux/zorro.h>
drivers/scsi/dc395x.c renamed from drivers/scsi.org/dc395x.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/dc395x.c linux-2.6.6/drivers/scsi/dc395x.c
@@ -53,7 +53,7 @@
 #include <linux/blkdev.h>
 #include <asm/io.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "dc395x.h"
 #include <scsi/scsicam.h>	/* needed for scsicam_bios_param */
 #include <linux/interrupt.h>
drivers/scsi/dec_esp.c renamed from drivers/scsi.org/dec_esp.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/dec_esp.c linux-2.6.6/drivers/scsi/dec_esp.c
@@ -29,7 +29,7 @@
 #include <linux/stat.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "NCR53C9x.h"
 
 #include <asm/irq.h>
drivers/scsi/dmx3191d.c renamed from drivers/scsi.org/dmx3191d.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/dmx3191d.c linux-2.6.6/drivers/scsi/dmx3191d.c
@@ -34,7 +34,7 @@
 #include <linux/delay.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 #include "dmx3191d.h"
drivers/scsi/dpt_i2o.c renamed from drivers/scsi.org/dpt_i2o.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/dpt_i2o.c linux-2.6.6/drivers/scsi/dpt_i2o.c
@@ -65,7 +65,7 @@ MODULE_DESCRIPTION("Adaptec I2O RAID Dri
 #include <asm/io.h>		/* for virt_to_bus, etc. */
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 #include "dpt/dptsig.h"
 #include "dpti.h"
drivers/scsi/dtc.c renamed from drivers/scsi.org/dtc.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/dtc.c linux-2.6.6/drivers/scsi/dtc.c
@@ -84,7 +84,7 @@
 #include <linux/interrupt.h>
 #include <asm/io.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "dtc.h"
 #define AUTOPROBE_IRQ
 #include "NCR5380.h"
drivers/scsi/eata.c renamed from drivers/scsi.org/eata.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/eata.c linux-2.6.6/drivers/scsi/eata.c
@@ -495,7 +495,7 @@
 #include <linux/spinlock.h>
 #include <scsi/scsicam.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <asm/dma.h>
 #include <asm/irq.h>
drivers/scsi/eata_pio.c renamed from drivers/scsi.org/eata_pio.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/eata_pio.c linux-2.6.6/drivers/scsi/eata_pio.c
@@ -63,7 +63,7 @@
 #include <asm/io.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <scsi/scsicam.h>
 
 #include "eata_generic.h"
drivers/scsi/esp.c renamed from drivers/scsi.org/esp.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/esp.c linux-2.6.6/drivers/scsi/esp.c
@@ -27,7 +27,7 @@
 #include <linux/interrupt.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "esp.h"
 
 #include <asm/sbus.h>
drivers/scsi/fastlane.c renamed from drivers/scsi.org/fastlane.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/fastlane.c linux-2.6.6/drivers/scsi/fastlane.c
@@ -36,7 +36,7 @@
 #include <linux/interrupt.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "NCR53C9x.h"
 
 #include <linux/zorro.h>
drivers/scsi/fcal.c renamed from drivers/scsi.org/fcal.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/fcal.c linux-2.6.6/drivers/scsi/fcal.c
@@ -21,7 +21,7 @@
 #include <asm/irq.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "../fc4/fcp_impl.h"
 #include "fcal.h"
drivers/scsi/fd_mcs.c renamed from drivers/scsi.org/fd_mcs.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/fd_mcs.c linux-2.6.6/drivers/scsi/fd_mcs.c
@@ -93,7 +93,7 @@
 #include <asm/system.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "fd_mcs.h"
 
 #define DRIVER_VERSION "v0.2 by ZP Gu<[email protected]>"
drivers/scsi/fdomain.c renamed from drivers/scsi.org/fdomain.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/fdomain.c linux-2.6.6/drivers/scsi/fdomain.c
@@ -284,7 +284,7 @@
 #include <asm/system.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 MODULE_AUTHOR("Rickard E. Faith");
 MODULE_DESCRIPTION("Future domain SCSI driver");
drivers/scsi/g_NCR5380.c renamed from drivers/scsi.org/g_NCR5380.c +1 -1
@@ -107,7 +107,7 @@
 #include <linux/sched.h>
 #include <linux/blkdev.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "g_NCR5380.h"
 #include "NCR5380.h"
 #include <linux/stat.h>
drivers/scsi/gvp11.c renamed from drivers/scsi.org/gvp11.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/gvp11.c linux-2.6.6/drivers/scsi/gvp11.c
@@ -16,7 +16,7 @@
 #include <linux/spinlock.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "wd33c93.h"
 #include "gvp11.h"
drivers/scsi/i60uscsi.c renamed from drivers/scsi.org/i60uscsi.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/i60uscsi.c linux-2.6.6/drivers/scsi/i60uscsi.c
@@ -81,7 +81,7 @@
 #include <asm/io.h>
 #include <linux/blkdev.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "inia100.h"
 
 #define JIFFIES_TO_MS(t) ((t) * 1000 / HZ)
drivers/scsi/ibmmca.c renamed from drivers/scsi.org/ibmmca.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/ibmmca.c linux-2.6.6/drivers/scsi/ibmmca.c
@@ -45,7 +45,7 @@
 #include <asm/io.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "ibmmca.h"
 
 /* current version of this driver-source: */
drivers/scsi/ide-scsi.c renamed from drivers/scsi.org/ide-scsi.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/ide-scsi.c linux-2.6.6/drivers/scsi/ide-scsi.c
@@ -51,7 +51,7 @@
 #include <asm/uaccess.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <scsi/sg.h>
 
 #define IDESCSI_DEBUG_LOG		0
drivers/scsi/imm.h renamed from drivers/scsi.org/imm.h +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/imm.h linux-2.6.6/drivers/scsi/imm.h
@@ -79,7 +79,7 @@
 #include  <linux/interrupt.h>
 
 #include  <asm/io.h>
-#include  "hosts.h"
+#include  <scsi/scsi_host.h>
 /* batteries not included :-) */
 
 /*
drivers/scsi/in2000.c renamed from drivers/scsi.org/in2000.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/in2000.c linux-2.6.6/drivers/scsi/in2000.c
@@ -126,7 +126,7 @@
 #include <asm/system.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 #define IN2000_VERSION    "1.33-2.5"
 #define IN2000_DATE       "2002/11/03"
drivers/scsi/ini9100u.c renamed from drivers/scsi.org/ini9100u.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/ini9100u.c linux-2.6.6/drivers/scsi/ini9100u.c
@@ -136,7 +136,7 @@
 #include <asm/io.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "ini9100u.h"
 
 #ifdef DEBUG_i91u
drivers/scsi/ips.c renamed from drivers/scsi.org/ips.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/ips.c linux-2.6.6/drivers/scsi/ips.c
@@ -176,7 +176,7 @@
 #include <scsi/sg.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "ips.h"
 
 #include <linux/module.h>
drivers/scsi/jazz_esp.c renamed from drivers/scsi.org/jazz_esp.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/jazz_esp.c linux-2.6.6/drivers/scsi/jazz_esp.c
@@ -16,7 +16,7 @@
 #include <linux/stat.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "NCR53C9x.h"
 
 #include <asm/irq.h>
drivers/scsi/lasi700.c renamed from drivers/scsi.org/lasi700.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/lasi700.c linux-2.6.6/drivers/scsi/lasi700.c
@@ -50,7 +50,7 @@
 #include <asm/delay.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 #include "lasi700.h"
 #include "53c700.h"
drivers/scsi/mac_esp.c renamed from drivers/scsi.org/mac_esp.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/mac_esp.c linux-2.6.6/drivers/scsi/mac_esp.c
@@ -26,7 +26,7 @@
 #include <linux/interrupt.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "NCR53C9x.h"
 
 #include <asm/io.h>
drivers/scsi/mac_scsi.c renamed from drivers/scsi.org/mac_scsi.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/mac_scsi.c linux-2.6.6/drivers/scsi/mac_scsi.c
@@ -52,7 +52,7 @@
 #include <asm/mac_via.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "mac_scsi.h"
 #include "NCR5380.h"
drivers/scsi/mca_53c9x.c renamed from drivers/scsi.org/mca_53c9x.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/mca_53c9x.c linux-2.6.6/drivers/scsi/mca_53c9x.c
@@ -43,7 +43,7 @@
 #include <linux/mca-legacy.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "NCR53C9x.h"
 
 #include <asm/dma.h>
drivers/scsi/megaraid.c renamed from drivers/scsi.org/megaraid.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/megaraid.c linux-2.6.6/drivers/scsi/megaraid.c
@@ -49,7 +49,7 @@
 #include <scsi/scsicam.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 #include "megaraid.h"
drivers/scsi/mvme147.c renamed from drivers/scsi.org/mvme147.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/mvme147.c linux-2.6.6/drivers/scsi/mvme147.c
@@ -11,7 +11,7 @@
 #include <asm/irq.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "wd33c93.h"
 #include "mvme147.h"
drivers/scsi/mvme16x.c renamed from drivers/scsi.org/mvme16x.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/mvme16x.c linux-2.6.6/drivers/scsi/mvme16x.c
@@ -15,7 +15,7 @@
 #include <asm/irq.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "53c7xx.h"
 #include "mvme16x.h"
drivers/scsi/NCR53c406a.c renamed from drivers/scsi.org/NCR53c406a.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/NCR53c406a.c linux-2.6.6/drivers/scsi/NCR53c406a.c
@@ -54,7 +54,7 @@
 #include <linux/blkdev.h>
 #include <linux/spinlock.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 /* ============================================================= */
drivers/scsi/ncr53c8xx.c renamed from drivers/scsi.org/ncr53c8xx.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/ncr53c8xx.c linux-2.6.6/drivers/scsi/ncr53c8xx.c
@@ -138,7 +138,7 @@
 #include <asm/system.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 #include "ncr53c8xx.h"
drivers/scsi/NCR53C9x.c renamed from drivers/scsi.org/NCR53C9x.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/NCR53C9x.c linux-2.6.6/drivers/scsi/NCR53C9x.c
@@ -36,7 +36,7 @@
 #include <linux/init.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "NCR53C9x.h"
 
 #include <asm/system.h>
drivers/scsi/NCR_D700.c renamed from drivers/scsi.org/NCR_D700.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/NCR_D700.c linux-2.6.6/drivers/scsi/NCR_D700.c
@@ -100,7 +100,7 @@
 #include <asm/io.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 #include "53c700.h"
 #include "NCR_D700.h"
drivers/scsi/NCR_Q720.c renamed from drivers/scsi.org/NCR_Q720.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/NCR_Q720.c linux-2.6.6/drivers/scsi/NCR_Q720.c
@@ -16,7 +16,7 @@
 #include <asm/io.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 #include "ncr53c8xx.h"
drivers/scsi/nsp32.c renamed from drivers/scsi.org/nsp32.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/nsp32.c linux-2.6.6/drivers/scsi/nsp32.c
@@ -45,7 +45,7 @@
 #include <asm/io.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <scsi/scsi_ioctl.h>
 #include <scsi/scsi.h>
drivers/scsi/oktagon_esp.c renamed from drivers/scsi.org/oktagon_esp.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/oktagon_esp.c linux-2.6.6/drivers/scsi/oktagon_esp.c
@@ -29,7 +29,7 @@
 
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "NCR53C9x.h"
 
 #include <linux/zorro.h>
drivers/scsi/osst.c renamed from drivers/scsi.org/osst.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/osst.c linux-2.6.6/drivers/scsi/osst.c
@@ -61,7 +61,7 @@ const char * osst_version = "0.99.1";
 #define OSST_DEB_MSG  KERN_NOTICE
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <scsi/scsi_driver.h>
 #include <scsi/scsi_ioctl.h>
drivers/scsi/pas16.c renamed from drivers/scsi.org/pas16.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/pas16.c linux-2.6.6/drivers/scsi/pas16.c
@@ -125,7 +125,7 @@
 #include <linux/init.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "pas16.h"
 #define AUTOPROBE_IRQ
 #include "NCR5380.h"
drivers/scsi/pc980155.c renamed from drivers/scsi.org/pc980155.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/pc980155.c linux-2.6.6/drivers/scsi/pc980155.c
@@ -20,7 +20,7 @@
 #include <asm/dma.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "wd33c93.h"
 #include "pc980155.h"
drivers/scsi/pci2000.c renamed from drivers/scsi.org/pci2000.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/pci2000.c linux-2.6.6/drivers/scsi/pci2000.c
@@ -54,7 +54,7 @@
 #include <asm/io.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "pci2000.h"
 #include "psi_roy.h"
drivers/scsi/pci2220i.c renamed from drivers/scsi.org/pci2220i.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/pci2220i.c linux-2.6.6/drivers/scsi/pci2220i.c
@@ -59,7 +59,7 @@
 #include <asm/io.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "pci2220i.h"
 #include "psi_dale.h"
drivers/scsi/pcmcia/aha152x_stub.c renamed from drivers/scsi.org/pcmcia/aha152x_stub.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/pcmcia/aha152x_stub.c linux-2.6.6/drivers/scsi/pcmcia/aha152x_stub.c
@@ -47,7 +47,7 @@
 #include <scsi/scsi_ioctl.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "aha152x.h"
 
 #include <pcmcia/version.h>
drivers/scsi/pcmcia/fdomain_stub.c renamed from drivers/scsi.org/pcmcia/fdomain_stub.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/pcmcia/fdomain_stub.c linux-2.6.6/drivers/scsi/pcmcia/fdomain_stub.c
@@ -44,7 +44,7 @@
 #include <scsi/scsi_ioctl.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 #include <pcmcia/version.h>
 #include <pcmcia/cs_types.h>
drivers/scsi/pcmcia/qlogic_stub.c renamed from drivers/scsi.org/pcmcia/qlogic_stub.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/pcmcia/qlogic_stub.c linux-2.6.6/drivers/scsi/pcmcia/qlogic_stub.c
@@ -46,7 +46,7 @@
 #include <linux/interrupt.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "../qlogicfas408.h"
 
 #include <pcmcia/version.h>
drivers/scsi/pluto.c renamed from drivers/scsi.org/pluto.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/pluto.c linux-2.6.6/drivers/scsi/pluto.c
@@ -21,7 +21,7 @@
 #include <asm/irq.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "../fc4/fcp_impl.h"
 #include "pluto.h"
drivers/scsi/ppa.h renamed from drivers/scsi.org/ppa.h +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/ppa.h linux-2.6.6/drivers/scsi/ppa.h
@@ -86,7 +86,7 @@
 #include  <linux/interrupt.h>
 
 #include  <asm/io.h>
-#include  "hosts.h"
+#include  <scsi/scsi_host.h>
 /* batteries not included :-) */
 
 /*
drivers/scsi/psi240i.c renamed from drivers/scsi.org/psi240i.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/psi240i.c linux-2.6.6/drivers/scsi/psi240i.c
@@ -41,7 +41,7 @@
 #include <asm/system.h>
 #include <asm/io.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 #include "psi240i.h"
 #include "psi_chip.h"
drivers/scsi/qla1280.c renamed from drivers/scsi.org/qla1280.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/qla1280.c linux-2.6.6/drivers/scsi/qla1280.c
@@ -357,7 +357,7 @@
 #else
 #include <linux/blk.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "sd.h"
 #endif
drivers/scsi/qla2xxx/qla_os.h renamed from drivers/scsi.org/qla2xxx/qla_os.h +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/qla2xxx/qla_os.h linux-2.6.6/drivers/scsi/qla2xxx/qla_os.h
@@ -59,7 +59,7 @@
 #include <asm/uaccess.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 #include <scsi/scsicam.h>
 #include <scsi/scsi_ioctl.h>
drivers/scsi/qlogicfas408.c renamed from drivers/scsi.org/qlogicfas408.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/qlogicfas408.c linux-2.6.6/drivers/scsi/qlogicfas408.c
@@ -56,7 +56,7 @@
 #include <asm/dma.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "qlogicfas408.h"
 
 /*----------------------------------------------------------------*/
drivers/scsi/qlogicfas.c renamed from drivers/scsi.org/qlogicfas.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/qlogicfas.c linux-2.6.6/drivers/scsi/qlogicfas.c
@@ -32,7 +32,7 @@
 #include <asm/dma.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "qlogicfas408.h"
 
 /* Set the following to 2 to use normal interrupt (active high/totempole-
drivers/scsi/qlogicfc.c renamed from drivers/scsi.org/qlogicfc.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/qlogicfc.c linux-2.6.6/drivers/scsi/qlogicfc.c
@@ -64,7 +64,7 @@
 #include <asm/io.h>
 #include <asm/irq.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 #define pci64_dma_hi32(a) ((u32) (0xffffffff & (((u64)(a))>>32)))
 #define pci64_dma_lo32(a) ((u32) (0xffffffff & (((u64)(a)))))
drivers/scsi/qlogicisp.c renamed from drivers/scsi.org/qlogicisp.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/qlogicisp.c linux-2.6.6/drivers/scsi/qlogicisp.c
@@ -36,7 +36,7 @@
 #include <asm/irq.h>
 #include <asm/byteorder.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "qlogicisp.h"
 
 /* Configuration section *****************************************************/
drivers/scsi/qlogicpti.c renamed from drivers/scsi.org/qlogicpti.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/qlogicpti.c linux-2.6.6/drivers/scsi/qlogicpti.c
@@ -27,7 +27,7 @@
 #include <asm/byteorder.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "qlogicpti.h"
 
 #include <asm/sbus.h>
drivers/scsi/scsicam.c renamed from drivers/scsi.org/scsicam.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/scsicam.c linux-2.6.6/drivers/scsi/scsicam.c
@@ -19,7 +19,7 @@
 #include <linux/buffer_head.h>
 #include <asm/unaligned.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <scsi/scsicam.h>
 
 static int setsize(unsigned long capacity, unsigned int *cyls, unsigned int *hds,
drivers/scsi/scsi_debug.c renamed from drivers/scsi.org/scsi_debug.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/scsi_debug.c linux-2.6.6/drivers/scsi/scsi_debug.c
@@ -43,7 +43,7 @@
 
 #include <linux/blkdev.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <scsi/scsicam.h>
 
 #include <linux/stat.h>
drivers/scsi/scsi_devinfo.c renamed from drivers/scsi.org/scsi_devinfo.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/scsi_devinfo.c linux-2.6.6/drivers/scsi/scsi_devinfo.c
@@ -9,7 +9,7 @@
 #include <scsi/scsi_devinfo.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "scsi_priv.h"
 
 /*
drivers/scsi/scsi_error.c renamed from drivers/scsi.org/scsi_error.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/scsi_error.c linux-2.6.6/drivers/scsi/scsi_error.c
@@ -26,7 +26,7 @@
 #include <scsi/scsi_ioctl.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 #include "scsi_priv.h"
 #include "scsi_logging.h"
drivers/scsi/scsi_ioctl.c renamed from drivers/scsi.org/scsi_ioctl.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/scsi_ioctl.c linux-2.6.6/drivers/scsi/scsi_ioctl.c
@@ -20,7 +20,7 @@
 
 #include <linux/blkdev.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <scsi/scsi_ioctl.h>
 
 #include "scsi_logging.h"
drivers/scsi/scsi_module.c renamed from drivers/scsi.org/scsi_module.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/scsi_module.c linux-2.6.6/drivers/scsi/scsi_module.c
@@ -12,7 +12,7 @@
 #include <linux/module.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 
 static int __init init_this_scsi_driver(void)
drivers/scsi/scsi_pc98.c renamed from drivers/scsi.org/scsi_pc98.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/scsi_pc98.c linux-2.6.6/drivers/scsi/scsi_pc98.c
@@ -12,7 +12,7 @@
 #include <asm/pc9800.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 
 static int pc98_first_bios_param(struct scsi_device *sdev, int *ip)
drivers/scsi/sd.c renamed from drivers/scsi.org/sd.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/sd.c linux-2.6.6/drivers/scsi/sd.c
@@ -52,7 +52,7 @@
 #include <asm/uaccess.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 #include <scsi/scsi_driver.h>
 #include <scsi/scsi_ioctl.h>
drivers/scsi/seagate.c renamed from drivers/scsi.org/seagate.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/seagate.c linux-2.6.6/drivers/scsi/seagate.c
@@ -103,7 +103,7 @@
 #include <asm/uaccess.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "seagate.h"
 
 #include <scsi/scsi_ioctl.h>
drivers/scsi/sg.c renamed from drivers/scsi.org/sg.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/sg.c linux-2.6.6/drivers/scsi/sg.c
@@ -60,7 +60,7 @@ static int sg_version_num = 30530;	/* 2 
 
 #include <linux/blkdev.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <scsi/scsi_driver.h>
 #include <scsi/scsi_ioctl.h>
 #include <scsi/sg.h>
drivers/scsi/sgiwd93.c renamed from drivers/scsi.org/sgiwd93.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/sgiwd93.c linux-2.6.6/drivers/scsi/sgiwd93.c
@@ -31,7 +31,7 @@
 #include <asm/io.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "wd33c93.h"
 #include "sgiwd93.h"
drivers/scsi/sim710.c renamed from drivers/scsi.org/sim710.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/sim710.c linux-2.6.6/drivers/scsi/sim710.c
@@ -37,7 +37,7 @@
 #include <linux/interrupt.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "53c700.h"
drivers/scsi/sr.c renamed from drivers/scsi.org/sr.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/sr.c linux-2.6.6/drivers/scsi/sr.c
@@ -47,7 +47,7 @@
 #include <asm/uaccess.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 #include <scsi/scsi_driver.h>
 #include <scsi/scsi_ioctl.h>	/* For the door lock/unlock commands */
drivers/scsi/sr_ioctl.c renamed from drivers/scsi.org/sr_ioctl.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/sr_ioctl.c linux-2.6.6/drivers/scsi/sr_ioctl.c
@@ -11,7 +11,7 @@
 #include <asm/uaccess.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <scsi/scsi_ioctl.h>
 
 #include "sr.h"
drivers/scsi/sr_vendor.c renamed from drivers/scsi.org/sr_vendor.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/sr_vendor.c linux-2.6.6/drivers/scsi/sr_vendor.c
@@ -41,7 +41,7 @@
 
 #include <linux/blkdev.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <scsi/scsi_ioctl.h>
 
 #include <linux/cdrom.h>
drivers/scsi/st.c renamed from drivers/scsi.org/st.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/st.c linux-2.6.6/drivers/scsi/st.c
@@ -58,7 +58,7 @@ static char *verstr = "20040403";
 
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 #include <scsi/scsi_driver.h>
 #include <scsi/scsi_ioctl.h>
drivers/scsi/sun3_scsi.c renamed from drivers/scsi.org/sun3_scsi.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/sun3_scsi.c linux-2.6.6/drivers/scsi/sun3_scsi.c
@@ -75,7 +75,7 @@
 #define REAL_DMA
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "sun3_scsi.h"
 #include "NCR5380.h"
drivers/scsi/sun3_scsi_vme.c renamed from drivers/scsi.org/sun3_scsi_vme.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/sun3_scsi_vme.c linux-2.6.6/drivers/scsi/sun3_scsi_vme.c
@@ -41,7 +41,7 @@
 #define REAL_DMA
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "sun3_scsi.h"
 #include "NCR5380.h"
drivers/scsi/sun3x_esp.c renamed from drivers/scsi.org/sun3x_esp.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/sun3x_esp.c linux-2.6.6/drivers/scsi/sun3x_esp.c
@@ -16,7 +16,7 @@
 #include <linux/interrupt.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "NCR53C9x.h"
 
 #include <asm/sun3x.h>
drivers/scsi/sym53c416.c renamed from drivers/scsi.org/sym53c416.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/sym53c416.c linux-2.6.6/drivers/scsi/sym53c416.c
@@ -43,7 +43,7 @@
 #include <linux/blkdev.h>
 #include <linux/isapnp.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "sym53c416.h"
 
 #define VERSION_STRING        "Version 1.0.0-ac"
drivers/scsi/t128.c renamed from drivers/scsi.org/t128.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/t128.c linux-2.6.6/drivers/scsi/t128.c
@@ -118,7 +118,7 @@
 #include <linux/delay.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "t128.h"
 #define AUTOPROBE_IRQ
 #include "NCR5380.h"
drivers/scsi/tmscsim.c renamed from drivers/scsi.org/tmscsim.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/tmscsim.c linux-2.6.6/drivers/scsi/tmscsim.c
@@ -235,7 +235,7 @@
 #include <linux/interrupt.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <linux/stat.h>
 #include <scsi/scsicam.h>
drivers/scsi/u14-34f.c renamed from drivers/scsi.org/u14-34f.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/u14-34f.c linux-2.6.6/drivers/scsi/u14-34f.c
@@ -423,7 +423,7 @@
 #include <linux/spinlock.h>
 #include <scsi/scsicam.h>
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <asm/dma.h>
 #include <asm/irq.h>
drivers/scsi/ultrastor.c renamed from drivers/scsi.org/ultrastor.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/ultrastor.c linux-2.6.6/drivers/scsi/ultrastor.c
@@ -145,7 +145,7 @@
 
 #define ULTRASTOR_PRIVATE	/* Get the private stuff from ultrastor.h */
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include "ultrastor.h"
 
 #define FALSE 0
drivers/scsi/wd33c93.c renamed from drivers/scsi.org/wd33c93.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/wd33c93.c linux-2.6.6/drivers/scsi/wd33c93.c
@@ -83,7 +83,7 @@
 #include <asm/irq.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 #include "wd33c93.h"
drivers/scsi/wd7000.c renamed from drivers/scsi.org/wd7000.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/wd7000.c linux-2.6.6/drivers/scsi/wd7000.c
@@ -183,7 +183,7 @@
 #include <asm/io.h>
 
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 #include <scsi/scsicam.h>
drivers/scsi/zalon.c renamed from drivers/scsi.org/zalon.c +1 -1
diff -purN linux-2.6.6/drivers/scsi.org/zalon.c linux-2.6.6/drivers/scsi/zalon.c
@@ -24,7 +24,7 @@
 
 #include "../parisc/gsc.h"
 #include "scsi.h"
-#include "hosts.h"
+#include <scsi/scsi_host.h>
 
 #include "ncr53c8xx.h"