diff -ur linux.orig/drivers/ide/cmd64x.c linux/drivers/ide/cmd64x.c
--- linux.orig/drivers/ide/cmd64x.c	Sun Nov 17 16:55:16 2002
+++ linux/drivers/ide/cmd64x.c	Sun Nov 17 16:58:56 2002
@@ -19,10 +19,10 @@
 #include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/hdreg.h>
-#include <linux/ide.h>
 #include <linux/init.h>
 
 #include <asm/io.h>
+#include <linux/ide.h>
 
 #include "ide_modes.h"
 
Only in linux/drivers/ide: cmd64x.c.orig
Only in linux/drivers/ide: cmd64x.c~
diff -ur linux.orig/drivers/ide/ide-cd.c linux/drivers/ide/ide-cd.c
--- linux.orig/drivers/ide/ide-cd.c	Sun Nov 17 16:55:16 2002
+++ linux/drivers/ide/ide-cd.c	Sun Nov 17 16:58:56 2002
@@ -307,13 +307,13 @@
 #include <linux/interrupt.h>
 #include <linux/errno.h>
 #include <linux/cdrom.h>
-#include <linux/ide.h>
 
 #include <asm/irq.h>
 #include <asm/io.h>
 #include <asm/byteorder.h>
 #include <asm/uaccess.h>
 #include <asm/unaligned.h>
+#include <linux/ide.h>
 
 #include "ide-cd.h"
 
diff -ur linux.orig/drivers/ide/ide-disk.c linux/drivers/ide/ide-disk.c
--- linux.orig/drivers/ide/ide-disk.c	Sun Nov 17 16:55:16 2002
+++ linux/drivers/ide/ide-disk.c	Sun Nov 17 17:00:44 2002
@@ -49,12 +49,12 @@
 #include <linux/genhd.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
-#include <linux/ide.h>
 
 #include <asm/byteorder.h>
 #include <asm/irq.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
+#include <linux/ide.h>
 
 #ifdef CONFIG_BLK_DEV_PDC4030
 #define IS_PDC4030_DRIVE (HWIF(drive)->chipset == ide_pdc4030)
Only in linux/drivers/ide: ide-disk.c.orig
Only in linux/drivers/ide: ide-disk.c~
diff -ur linux.orig/drivers/ide/ide-dma.c linux/drivers/ide/ide-dma.c
--- linux.orig/drivers/ide/ide-dma.c	Sun Nov 17 16:55:16 2002
+++ linux/drivers/ide/ide-dma.c	Sun Nov 17 16:58:56 2002
@@ -86,10 +86,10 @@
 #include <linux/interrupt.h>
 #include <linux/pci.h>
 #include <linux/init.h>
-#include <linux/ide.h>
 
 #include <asm/io.h>
 #include <asm/irq.h>
+#include <linux/ide.h>
 
 #include <linux/kcomp.h>
 
diff -ur linux.orig/drivers/ide/ide-features.c linux/drivers/ide/ide-features.c
--- linux.orig/drivers/ide/ide-features.c	Sun Nov 17 16:55:16 2002
+++ linux/drivers/ide/ide-features.c	Sun Nov 17 16:58:56 2002
@@ -30,13 +30,13 @@
 #include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/hdreg.h>
-#include <linux/ide.h>
 
 #include <asm/byteorder.h>
 #include <asm/irq.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
 #include <asm/bitops.h>
+#include <linux/ide.h>
 
 /*
  * A Verbose noise maker for debugging on the attempted transfer rates.
diff -ur linux.orig/drivers/ide/ide-floppy.c linux/drivers/ide/ide-floppy.c
--- linux.orig/drivers/ide/ide-floppy.c	Sun Nov 17 16:55:16 2002
+++ linux/drivers/ide/ide-floppy.c	Sun Nov 17 16:58:56 2002
@@ -97,7 +97,6 @@
 #include <linux/genhd.h>
 #include <linux/slab.h>
 #include <linux/cdrom.h>
-#include <linux/ide.h>
 
 #include <asm/byteorder.h>
 #include <asm/irq.h>
@@ -105,6 +104,7 @@
 #include <asm/io.h>
 #include <asm/unaligned.h>
 #include <asm/bitops.h>
+#include <linux/ide.h>
 
 /*
  *	The following are used to debug the driver.
diff -ur linux.orig/drivers/ide/ide-geometry.c linux/drivers/ide/ide-geometry.c
--- linux.orig/drivers/ide/ide-geometry.c	Sun Nov 17 16:55:16 2002
+++ linux/drivers/ide/ide-geometry.c	Sun Nov 17 17:00:19 2002
@@ -2,9 +2,9 @@
  * linux/drivers/ide/ide-geometry.c
  */
 #include <linux/config.h>
-#include <linux/ide.h>
 #include <linux/mc146818rtc.h>
 #include <asm/io.h>
+#include <linux/ide.h>
 
 #ifdef CONFIG_BLK_DEV_IDE
 
diff -ur linux.orig/drivers/ide/ide-pci.c linux/drivers/ide/ide-pci.c
--- linux.orig/drivers/ide/ide-pci.c	Sun Nov 17 16:55:16 2002
+++ linux/drivers/ide/ide-pci.c	Sun Nov 17 16:58:56 2002
@@ -28,10 +28,10 @@
 #include <linux/interrupt.h>
 #include <linux/pci.h>
 #include <linux/init.h>
-#include <linux/ide.h>
 
 #include <asm/io.h>
 #include <asm/irq.h>
+#include <linux/ide.h>
 
 #include "idecomp.h"
 
diff -ur linux.orig/drivers/ide/ide-probe.c linux/drivers/ide/ide-probe.c
--- linux.orig/drivers/ide/ide-probe.c	Sun Nov 17 16:55:17 2002
+++ linux/drivers/ide/ide-probe.c	Sun Nov 17 16:58:56 2002
@@ -46,12 +46,12 @@
 #include <linux/malloc.h>
 #include <linux/delay.h>
 #include <linux/mc146818rtc.h> /* CMOS defines */
-#include <linux/ide.h>
 
 #include <asm/byteorder.h>
 #include <asm/irq.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
+#include <linux/ide.h>
 
 static inline void do_identify (ide_drive_t *drive, byte cmd)
 {
diff -ur linux.orig/drivers/ide/ide-proc.c linux/drivers/ide/ide-proc.c
--- linux.orig/drivers/ide/ide-proc.c	Sun Nov 17 16:55:17 2002
+++ linux/drivers/ide/ide-proc.c	Sun Nov 17 16:58:56 2002
@@ -65,9 +65,9 @@
 #include <linux/mm.h>
 #include <linux/pci.h>
 #include <linux/ctype.h>
-#include <linux/ide.h>
 
 #include <asm/io.h>
+#include <linux/ide.h>
 
 #include "idecomp.h"
 
diff -ur linux.orig/drivers/ide/ide-tape.c linux/drivers/ide/ide-tape.c
--- linux.orig/drivers/ide/ide-tape.c	Sun Nov 17 16:55:17 2002
+++ linux/drivers/ide/ide-tape.c	Sun Nov 17 16:58:56 2002
@@ -417,7 +417,6 @@
 #include <linux/genhd.h>
 #include <linux/slab.h>
 #include <linux/pci.h>
-#include <linux/ide.h>
 
 #include <asm/byteorder.h>
 #include <asm/irq.h>
@@ -425,6 +424,7 @@
 #include <asm/io.h>
 #include <asm/unaligned.h>
 #include <asm/bitops.h>
+#include <linux/ide.h>
 
 
 #define NO_LONGER_REQUIRED	(1)
diff -ur linux.orig/drivers/ide/ide-taskfile.c linux/drivers/ide/ide-taskfile.c
--- linux.orig/drivers/ide/ide-taskfile.c	Sun Nov 17 16:55:17 2002
+++ linux/drivers/ide/ide-taskfile.c	Sun Nov 17 16:58:56 2002
@@ -25,13 +25,13 @@
 #include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/hdreg.h>
-#include <linux/ide.h>
 
 #include <asm/byteorder.h>
 #include <asm/irq.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
 #include <asm/bitops.h>
+#include <linux/ide.h>
 
 #ifdef CONFIG_IDE_TASKFILE_IO
 #  define __TASKFILE__IO
diff -ur linux.orig/drivers/ide/ide.c linux/drivers/ide/ide.c
--- linux.orig/drivers/ide/ide.c	Sun Nov 17 16:55:17 2002
+++ linux/drivers/ide/ide.c	Sun Nov 17 16:59:43 2002
@@ -145,13 +145,13 @@
 #endif /* MODULE */
 #include <linux/pci.h>
 #include <linux/delay.h>
-#include <linux/ide.h>
 #include <linux/reboot.h>
 
 #include <asm/byteorder.h>
 #include <asm/irq.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
+#include <linux/ide.h>
 #include <asm/bitops.h>
 
 #include "ide_modes.h"
diff -ur linux.orig/drivers/ide/ns87415.c linux/drivers/ide/ns87415.c
--- linux.orig/drivers/ide/ns87415.c	Sun Nov 17 16:55:17 2002
+++ linux/drivers/ide/ns87415.c	Sun Nov 17 17:00:02 2002
@@ -19,10 +19,10 @@
 #include <linux/hdreg.h>
 #include <linux/pci.h>
 #include <linux/delay.h>
-#include <linux/ide.h>
 #include <linux/init.h>
 
 #include <asm/io.h>
+#include <linux/ide.h>
 
 static unsigned int ns87415_count = 0, ns87415_control[MAX_HWIFS] = { 0 };
 
--- linux.orig/drivers/scsi/ide-scsi.c    Sun Nov 17 21:43:01 2002
+++ linux/drivers/scsi/ide-scsi.c     Sun Nov 17 22:33:15 2002
@@ -41,9 +41,9 @@
 #include <linux/errno.h>
 #include <linux/hdreg.h>
 #include <linux/slab.h>
-#include <linux/ide.h>

 #include <asm/io.h>
+#include <linux/ide.h>
 #include <asm/bitops.h>
 #include <asm/uaccess.h>