[PATCH] remove all #include <blk.h>'s

This causes blk.h to print a warning and removes all uses of blk.h.
I've tested the compilation in 2.6.0-test1 with a .config that tries to
compile as many drivers as possible.

diff --git a/arch/alpha/mm/init.c b/arch/alpha/mm/init.c
index e797ec2..0542c0e 100644 (file)
--- a/arch/alpha/mm/init.c
+++ b/arch/alpha/mm/init.c
@@ -20,9 +20,6 @@
 #include <linux/init.h>
 #include <linux/bootmem.h> /* max_low_pfn */
 #include <linux/vmalloc.h>
-#ifdef CONFIG_BLK_DEV_INITRD
-#include <linux/blk.h>
-#endif
 
 #include <asm/system.h>
 #include <asm/uaccess.h>

diff --git a/arch/arm/mach-clps711x/autcpu12.c b/arch/arm/mach-clps711x/autcpu12.c
index 1cb34fa..e05549a 100644 (file)
--- a/arch/arm/mach-clps711x/autcpu12.c
+++ b/arch/arm/mach-clps711x/autcpu12.c
@@ -21,7 +21,6 @@
 #include <linux/init.h>
 #include <linux/types.h>
 #include <linux/string.h>
-#include <linux/blk.h>
 #include <linux/mm.h>
 
 #include <asm/hardware.h>

diff --git a/arch/arm26/kernel/setup.c b/arch/arm26/kernel/setup.c
index a5e07d7..38b1879 100644 (file)
--- a/arch/arm26/kernel/setup.c
+++ b/arch/arm26/kernel/setup.c
@@ -14,7 +14,7 @@
 #include <linux/ioport.h>
 #include <linux/delay.h>
 #include <linux/utsname.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/console.h>
 #include <linux/bootmem.h>
 #include <linux/seq_file.h>

diff --git a/arch/arm26/mm/init.c b/arch/arm26/mm/init.c
index 989f08c..7013d0b 100644 (file)
--- a/arch/arm26/mm/init.c
+++ b/arch/arm26/mm/init.c
@@ -22,7 +22,7 @@
 #include <linux/init.h>
 #include <linux/initrd.h>
 #include <linux/bootmem.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 
 #include <asm/segment.h>
 #include <asm/mach-types.h>

diff --git a/arch/h8300/kernel/setup.c b/arch/h8300/kernel/setup.c
index 645db05..ac44673 100644 (file)
--- a/arch/h8300/kernel/setup.c
+++ b/arch/h8300/kernel/setup.c
@@ -35,7 +35,6 @@
 #include <asm/irq.h>
 
 #ifdef CONFIG_BLK_DEV_INITRD
-#include <linux/blk.h>
 #include <asm/pgtable.h>
 #endif
 

diff --git a/arch/h8300/mm/init.c b/arch/h8300/mm/init.c
index 164dc60..4a0cf43 100644 (file)
--- a/arch/h8300/mm/init.c
+++ b/arch/h8300/mm/init.c
@@ -23,9 +23,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/types.h>
-#ifdef CONFIG_BLK_DEV_RAM
-#include <linux/blk.h>
-#endif
 #include <linux/ptrace.h>
 #include <linux/mman.h>
 #include <linux/mm.h>

diff --git a/arch/i386/mm/init.c b/arch/i386/mm/init.c
index 19321ca..daba5d6 100644 (file)
--- a/arch/i386/mm/init.c
+++ b/arch/i386/mm/init.c
@@ -20,9 +20,6 @@
 #include <linux/swap.h>
 #include <linux/smp.h>
 #include <linux/init.h>
-#ifdef CONFIG_BLK_DEV_INITRD
-#include <linux/blk.h>
-#endif
 #include <linux/highmem.h>
 #include <linux/pagemap.h>
 #include <linux/bootmem.h>

diff --git a/arch/ia64/hp/sim/simscsi.c b/arch/ia64/hp/sim/simscsi.c
index 2982f53..a98db25 100644 (file)
--- a/arch/ia64/hp/sim/simscsi.c
+++ b/arch/ia64/hp/sim/simscsi.c
@@ -9,7 +9,7 @@
  * 99/12/18 David Mosberger    Added support for READ10/WRITE10 needed by linux v2.3.33
  */
 #include <linux/config.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/kernel.h>

diff --git a/arch/ia64/ia32/ia32_ioctl.c b/arch/ia64/ia32/ia32_ioctl.c
index 3e7a9fe..f1fd81b 100644 (file)
--- a/arch/ia64/ia32/ia32_ioctl.c
+++ b/arch/ia64/ia32/ia32_ioctl.c
@@ -52,7 +52,7 @@
 #include <linux/raw.h>
 #include <linux/smb_fs.h>
 #include <linux/blkpg.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/elevator.h>
 #include <linux/rtc.h>
 #include <linux/pci.h>

diff --git a/arch/m68k/atari/stram.c b/arch/m68k/atari/stram.c
index f09dd03..8e7e42e 100644 (file)
--- a/arch/m68k/atari/stram.c
+++ b/arch/m68k/atari/stram.c
@@ -37,7 +37,6 @@
 #define MAJOR_NR    Z2RAM_MAJOR
 #define do_z2_request do_stram_request
 #define DEVICE_NR(device) (minor(device))
-#include <linux/blk.h>
 #endif
 
 #undef DEBUG

diff --git a/arch/m68k/mm/init.c b/arch/m68k/mm/init.c
index fd1d4b1..aaafbf6 100644 (file)
--- a/arch/m68k/mm/init.c
+++ b/arch/m68k/mm/init.c
@@ -17,9 +17,6 @@
 #include <linux/types.h>
 #include <linux/init.h>
 #include <linux/bootmem.h>
-#ifdef CONFIG_BLK_DEV_RAM
-#include <linux/blk.h>
-#endif
 
 #include <asm/setup.h>
 #include <asm/uaccess.h>

diff --git a/arch/m68k/mm/motorola.c b/arch/m68k/mm/motorola.c
index a8ce74a..defa7cf 100644 (file)
--- a/arch/m68k/mm/motorola.c
+++ b/arch/m68k/mm/motorola.c
@@ -18,9 +18,6 @@
 #include <linux/types.h>
 #include <linux/init.h>
 #include <linux/bootmem.h>
-#ifdef CONFIG_BLK_DEV_RAM
-#include <linux/blk.h>
-#endif
 
 #include <asm/setup.h>
 #include <asm/uaccess.h>

diff --git a/arch/m68k/mm/sun3mmu.c b/arch/m68k/mm/sun3mmu.c
index 3628332..084fbfb 100644 (file)
--- a/arch/m68k/mm/sun3mmu.c
+++ b/arch/m68k/mm/sun3mmu.c
@@ -16,9 +16,6 @@
 #include <linux/string.h>
 #include <linux/types.h>
 #include <linux/init.h>
-#ifdef CONFIG_BLK_DEV_RAM
-#include <linux/blk.h>
-#endif
 #include <linux/bootmem.h>
 
 #include <asm/setup.h>

diff --git a/arch/m68knommu/kernel/setup.c b/arch/m68knommu/kernel/setup.c
index 88ad2a8..f9d2090 100644 (file)
--- a/arch/m68knommu/kernel/setup.c
+++ b/arch/m68knommu/kernel/setup.c
@@ -37,7 +37,6 @@
 #include <asm/machdep.h>
 
 #ifdef CONFIG_BLK_DEV_INITRD
-#include <linux/blk.h>
 #include <asm/pgtable.h>
 #endif
 

diff --git a/arch/m68knommu/mm/init.c b/arch/m68knommu/mm/init.c
index 133afbf..08791f0 100644 (file)
--- a/arch/m68knommu/mm/init.c
+++ b/arch/m68knommu/mm/init.c
@@ -27,9 +27,6 @@
 #include <linux/mm.h>
 #include <linux/swap.h>
 #include <linux/init.h>
-#ifdef CONFIG_BLK_DEV_RAM
-#include <linux/blk.h>
-#endif
 #include <linux/highmem.h>
 #include <linux/pagemap.h>
 #include <linux/bootmem.h>

diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c
index b0e8fa6..4f9351c 100644 (file)
--- a/arch/mips/mm/init.c
+++ b/arch/mips/mm/init.c
@@ -24,7 +24,7 @@
 #include <linux/bootmem.h>
 #include <linux/highmem.h>
 #include <linux/swap.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 
 #include <asm/bootinfo.h>
 #include <asm/cacheflush.h>

diff --git a/arch/mips/momentum/ocelot_c/setup.c b/arch/mips/momentum/ocelot_c/setup.c
index c0ead32..a44ac8e 100644 (file)
--- a/arch/mips/momentum/ocelot_c/setup.c
+++ b/arch/mips/momentum/ocelot_c/setup.c
@@ -63,7 +63,7 @@
 #include <asm/mc146818rtc.h>
 #include <linux/version.h>
 #include <linux/bootmem.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <asm/mv64340.h>
 #include "ocelot_c_fpga.h"
 

diff --git a/arch/mips/momentum/ocelot_g/setup.c b/arch/mips/momentum/ocelot_g/setup.c
index d4e1c47..2666607 100644 (file)
--- a/arch/mips/momentum/ocelot_g/setup.c
+++ b/arch/mips/momentum/ocelot_g/setup.c
@@ -64,7 +64,7 @@
 #include <asm/mc146818rtc.h>
 #include <linux/version.h>
 #include <linux/bootmem.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include "gt64240.h"
 #include "ocelot_pld.h"
 

diff --git a/arch/mips/sibyte/cfe/setup.c b/arch/mips/sibyte/cfe/setup.c
index bb34a62..f77601b 100644 (file)
--- a/arch/mips/sibyte/cfe/setup.c
+++ b/arch/mips/sibyte/cfe/setup.c
@@ -20,7 +20,7 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/mm.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/bootmem.h>
 #include <linux/smp.h>
 

diff --git a/arch/mips/sibyte/sb1250/prom.c b/arch/mips/sibyte/sb1250/prom.c
index d78a974..964b074 100644 (file)
--- a/arch/mips/sibyte/sb1250/prom.c
+++ b/arch/mips/sibyte/sb1250/prom.c
@@ -20,7 +20,7 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/mm.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/bootmem.h>
 #include <linux/smp.h>
 

diff --git a/arch/mips/sibyte/swarm/setup.c b/arch/mips/sibyte/swarm/setup.c
index 5082fb6..855b24f 100644 (file)
--- a/arch/mips/sibyte/swarm/setup.c
+++ b/arch/mips/sibyte/swarm/setup.c
@@ -23,7 +23,7 @@
 #include <linux/spinlock.h>
 #include <linux/mm.h>
 #include <linux/bootmem.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/init.h>
 #include <linux/ide.h>
 #include <linux/console.h>

diff --git a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c
index eac042b..9e47fee 100644 (file)
--- a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c
+++ b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c
@@ -134,7 +134,7 @@ JP7 is not bus master -- do NOT use -- only 4 pci bus master's allowed -- SouthB
 #include <asm/time.h>
 #include <linux/version.h>
 #include <linux/bootmem.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #ifdef CONFIG_RTC_DS1742
 #include <asm/rtc_ds1742.h>
 #endif

diff --git a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c
index c449e3e..a2f9a2b 100644 (file)
--- a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c
+++ b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c
@@ -62,7 +62,7 @@
 #include <asm/time.h>
 #include <linux/version.h>
 #include <linux/bootmem.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/console.h>
 #ifdef CONFIG_RTC_DS1742
 #include <asm/rtc_ds1742.h>

diff --git a/arch/mips/vr41xx/tanbac-tb0229/setup.c b/arch/mips/vr41xx/tanbac-tb0229/setup.c
index 7e1bdd9..af286bb 100644 (file)
--- a/arch/mips/vr41xx/tanbac-tb0229/setup.c
+++ b/arch/mips/vr41xx/tanbac-tb0229/setup.c
@@ -18,7 +18,7 @@
  *  option) any later version.
  */
 #include <linux/config.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/console.h>
 #include <linux/init.h>
 #include <linux/ioport.h>

diff --git a/arch/mips64/kernel/setup.c b/arch/mips64/kernel/setup.c
index 6d7c89f..53ea6d1 100644 (file)
--- a/arch/mips64/kernel/setup.c
+++ b/arch/mips64/kernel/setup.c
@@ -28,9 +28,6 @@
 #include <linux/a.out.h>
 #include <linux/tty.h>
 #include <linux/bootmem.h>
-#ifdef CONFIG_BLK_DEV_RAM
-#include <linux/blk.h>
-#endif
 #include <linux/major.h>
 #include <linux/kdev_t.h>
 #include <linux/root_dev.h>

diff --git a/arch/parisc/kernel/ioctl32.c b/arch/parisc/kernel/ioctl32.c
index 8dba57e..41db315 100644 (file)
--- a/arch/parisc/kernel/ioctl32.c
+++ b/arch/parisc/kernel/ioctl32.c
@@ -48,7 +48,6 @@
 #include <linux/raw.h>
 #include <linux/smb_fs.h>
 #include <linux/blkpg.h>
-#include <linux/blk.h>
 #include <linux/elevator.h>
 #include <linux/rtc.h>
 #include <linux/pci.h>

diff --git a/arch/ppc/mm/mem_pieces.c b/arch/ppc/mm/mem_pieces.c
index ee5e981..9229bae 100644 (file)
--- a/arch/ppc/mm/mem_pieces.c
+++ b/arch/ppc/mm/mem_pieces.c
@@ -17,7 +17,6 @@
 #include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/stddef.h>
-#include <linux/blk.h>
 #include <linux/init.h>
 
 #include "mem_pieces.h"

diff --git a/arch/ppc/platforms/4xx/beech.c b/arch/ppc/platforms/4xx/beech.c
index 756417c..1f36fc2 100644 (file)
--- a/arch/ppc/platforms/4xx/beech.c
+++ b/arch/ppc/platforms/4xx/beech.c
@@ -25,7 +25,6 @@
  *
  */
 
-#include <linux/blk.h>
 #include <linux/config.h>
 #include <linux/init.h>
 #include <linux/module.h>

diff --git a/arch/ppc/platforms/4xx/sycamore.c b/arch/ppc/platforms/4xx/sycamore.c
index cd3b712..09f9c60 100644 (file)
--- a/arch/ppc/platforms/4xx/sycamore.c
+++ b/arch/ppc/platforms/4xx/sycamore.c
@@ -17,7 +17,6 @@
 #include <linux/threads.h>
 #include <linux/param.h>
 #include <linux/string.h>
-#include <linux/blk.h>
 #include <linux/pci.h>
 #include <linux/rtc.h>
 

diff --git a/arch/ppc/platforms/4xx/walnut.c b/arch/ppc/platforms/4xx/walnut.c
index 763b18a..f84ae9e 100644 (file)
--- a/arch/ppc/platforms/4xx/walnut.c
+++ b/arch/ppc/platforms/4xx/walnut.c
@@ -19,7 +19,6 @@
 #include <linux/threads.h>
 #include <linux/param.h>
 #include <linux/string.h>
-#include <linux/blk.h>
 #include <linux/pci.h>
 #include <linux/rtc.h>
 

diff --git a/arch/ppc/platforms/residual.c b/arch/ppc/platforms/residual.c
index 4f667a5..a616afc 100644 (file)
--- a/arch/ppc/platforms/residual.c
+++ b/arch/ppc/platforms/residual.c
@@ -36,7 +36,6 @@
 #include <linux/interrupt.h>
 #include <linux/reboot.h>
 #include <linux/init.h>
-#include <linux/blk.h>
 #include <linux/ioport.h>
 #include <linux/pci.h>
 #include <linux/ide.h>

diff --git a/arch/ppc64/kernel/XmPciLpEvent.c b/arch/ppc64/kernel/XmPciLpEvent.c
index 38ea296..92ab43a 100644 (file)
--- a/arch/ppc64/kernel/XmPciLpEvent.c
+++ b/arch/ppc64/kernel/XmPciLpEvent.c
@@ -12,7 +12,6 @@
 #include <linux/param.h>
 #include <linux/string.h>
 #include <linux/bootmem.h>
-#include <linux/blk.h>
 #include <linux/ide.h>
 
 #include <asm/iSeries/HvTypes.h>

diff --git a/arch/ppc64/kernel/iSeries_irq.c b/arch/ppc64/kernel/iSeries_irq.c
index ebd76fa..2b2b8b5 100644 (file)
--- a/arch/ppc64/kernel/iSeries_irq.c
+++ b/arch/ppc64/kernel/iSeries_irq.c
@@ -29,7 +29,6 @@
 #include <linux/param.h>
 #include <linux/string.h>
 #include <linux/bootmem.h>
-#include <linux/blk.h>
 #include <linux/ide.h>
 
 #include <linux/irq.h>

diff --git a/arch/ppc64/kernel/prom.c b/arch/ppc64/kernel/prom.c
index 7cee3c5..60463aa 100644 (file)
--- a/arch/ppc64/kernel/prom.c
+++ b/arch/ppc64/kernel/prom.c
@@ -27,7 +27,6 @@
 #include <linux/version.h>
 #include <linux/threads.h>
 #include <linux/spinlock.h>
-#include <linux/blk.h>
 #include <linux/types.h>
 #include <linux/pci.h>
 #include <asm/prom.h>

diff --git a/arch/ppc64/mm/init.c b/arch/ppc64/mm/init.c
index ca2472a..4218cb8 100644 (file)
--- a/arch/ppc64/mm/init.c
+++ b/arch/ppc64/mm/init.c
@@ -37,9 +37,6 @@
 #include <linux/bootmem.h>
 #include <linux/highmem.h>
 #include <linux/proc_fs.h>
-#ifdef CONFIG_BLK_DEV_INITRD
-#include <linux/blk.h>         /* for initrd_* */
-#endif
 
 #include <asm/pgalloc.h>
 #include <asm/page.h>

diff --git a/arch/s390/kernel/compat_ioctl.c b/arch/s390/kernel/compat_ioctl.c
index 0411628..b69c9d9 100644 (file)
--- a/arch/s390/kernel/compat_ioctl.c
+++ b/arch/s390/kernel/compat_ioctl.c
@@ -23,7 +23,6 @@
 #include <asm/types.h>
 #include <asm/uaccess.h>
 
-#include <linux/blk.h>
 #include <linux/blkpg.h>
 #include <linux/cdrom.h>
 #include <linux/dm-ioctl.h>

diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c
index 6262a3c..ab0e614 100644 (file)
--- a/arch/s390/mm/init.c
+++ b/arch/s390/mm/init.c
@@ -22,9 +22,6 @@
 #include <linux/swap.h>
 #include <linux/smp.h>
 #include <linux/init.h>
-#ifdef CONFIG_BLK_DEV_INITRD
-#include <linux/blk.h>
-#endif
 #include <linux/pagemap.h>
 #include <linux/bootmem.h>
 

diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c
index b4cec79..5c72add 100644 (file)
--- a/arch/sh/mm/init.c
+++ b/arch/sh/mm/init.c
@@ -22,9 +22,6 @@
 #include <linux/swap.h>
 #include <linux/smp.h>
 #include <linux/init.h>
-#ifdef CONFIG_BLK_DEV_INITRD
-#include <linux/blk.h>
-#endif
 #include <linux/highmem.h>
 #include <linux/bootmem.h>
 

diff --git a/arch/sparc/kernel/setup.c b/arch/sparc/kernel/setup.c
index d268a0f..abb3a9a 100644 (file)
--- a/arch/sparc/kernel/setup.c
+++ b/arch/sparc/kernel/setup.c
@@ -25,7 +25,6 @@
 #include <linux/kdev_t.h>
 #include <linux/major.h>
 #include <linux/string.h>
-#include <linux/blk.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/console.h>

diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c
index 498a72a..fe0584e 100644 (file)
--- a/arch/sparc/mm/srmmu.c
+++ b/arch/sparc/mm/srmmu.c
@@ -15,7 +15,6 @@
 #include <linux/vmalloc.h>
 #include <linux/pagemap.h>
 #include <linux/init.h>
-#include <linux/blk.h>
 #include <linux/spinlock.h>
 #include <linux/bootmem.h>
 #include <linux/fs.h>

diff --git a/arch/sparc64/kernel/setup.c b/arch/sparc64/kernel/setup.c
index 2d8c485..b55272c 100644 (file)
--- a/arch/sparc64/kernel/setup.c
+++ b/arch/sparc64/kernel/setup.c
@@ -24,7 +24,6 @@
 #include <linux/kdev_t.h>
 #include <linux/major.h>
 #include <linux/string.h>
-#include <linux/blk.h>
 #include <linux/init.h>
 #include <linux/inet.h>
 #include <linux/console.h>

diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
index 8e3b698..8cae722 100644 (file)
--- a/arch/um/drivers/ubd_kern.c
+++ b/arch/um/drivers/ubd_kern.c
@@ -15,7 +15,6 @@
 
 #include "linux/config.h"
 #include "linux/module.h"
-#include "linux/blk.h"
 #include "linux/blkdev.h"
 #include "linux/hdreg.h"
 #include "linux/init.h"

diff --git a/arch/x86_64/mm/init.c b/arch/x86_64/mm/init.c
index cafd352..e133fd8 100644 (file)
--- a/arch/x86_64/mm/init.c
+++ b/arch/x86_64/mm/init.c
@@ -19,9 +19,6 @@
 #include <linux/swap.h>
 #include <linux/smp.h>
 #include <linux/init.h>
-#ifdef CONFIG_BLK_DEV_INITRD
-#include <linux/blk.h>
-#endif
 #include <linux/pagemap.h>
 #include <linux/bootmem.h>
 #include <linux/proc_fs.h>

diff --git a/arch/x86_64/mm/numa.c b/arch/x86_64/mm/numa.c
index 738ae09..851d1f4 100644 (file)
--- a/arch/x86_64/mm/numa.c
+++ b/arch/x86_64/mm/numa.c
@@ -8,7 +8,6 @@
 #include <linux/init.h>
 #include <linux/bootmem.h>
 #include <linux/mmzone.h>
-#include <linux/blk.h>
 #include <linux/ctype.h>
 #include <asm/e820.h>
 #include <asm/proto.h>

diff --git a/drivers/acorn/block/fd1772.c b/drivers/acorn/block/fd1772.c
index 1243519..c067637 100644 (file)
--- a/drivers/acorn/block/fd1772.c
+++ b/drivers/acorn/block/fd1772.c
@@ -152,8 +152,6 @@
 #include <asm/uaccess.h>
 
 
-#include <linux/blk.h>
-
 /* Note: FD_MAX_UNITS could be redefined to 2 for the Atari (with
  * little additional rework in this file). But I'm not yet sure if
  * some other code depends on the number of floppies... (It is defined

diff --git a/drivers/acorn/block/mfmhd.c b/drivers/acorn/block/mfmhd.c
index dbd0da7..61add13 100644 (file)
--- a/drivers/acorn/block/mfmhd.c
+++ b/drivers/acorn/block/mfmhd.c
@@ -111,7 +111,6 @@
 #include <linux/major.h>
 #include <linux/ioport.h>
 #include <linux/delay.h>
-#include <linux/blk.h>
 #include <linux/blkpg.h>
 
 #include <asm/system.h>

diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c
index 8a4db96..ab2cbdd 100644 (file)
--- a/drivers/block/DAC960.c
+++ b/drivers/block/DAC960.c
@@ -23,7 +23,6 @@
 #include <linux/version.h>
 #include <linux/module.h>
 #include <linux/types.h>
-#include <linux/blk.h>
 #include <linux/blkdev.h>
 #include <linux/bio.h>
 #include <linux/completion.h>

diff --git a/drivers/block/acsi.c b/drivers/block/acsi.c
index 4f09419..f3014dd 100644 (file)
--- a/drivers/block/acsi.c
+++ b/drivers/block/acsi.c
@@ -55,7 +55,6 @@
 #include <linux/delay.h>
 #include <linux/mm.h>
 #include <linux/major.h>
-#include <linux/blk.h>
 #include <linux/slab.h>
 #include <linux/interrupt.h>
 #include <scsi/scsi.h> /* for SCSI_IOCTL_GET_IDLUN */

diff --git a/drivers/block/amiflop.c b/drivers/block/amiflop.c
index 9ad4b95..e11aae9 100644 (file)
--- a/drivers/block/amiflop.c
+++ b/drivers/block/amiflop.c
@@ -79,7 +79,6 @@
 #include <asm/amigahw.h>
 #include <asm/amigaints.h>
 #include <asm/irq.h>
-#include <linux/blk.h>
 
 #undef DEBUG /* print _LOTS_ of infos */
 

diff --git a/drivers/block/as-iosched.c b/drivers/block/as-iosched.c
index df1e95f..1482512 100644 (file)
--- a/drivers/block/as-iosched.c
+++ b/drivers/block/as-iosched.c
@@ -12,7 +12,6 @@
 #include <linux/blkdev.h>
 #include <linux/elevator.h>
 #include <linux/bio.h>
-#include <linux/blk.h>
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/slab.h>

diff --git a/drivers/block/ataflop.c b/drivers/block/ataflop.c
index ee058e3..76ca82d 100644 (file)
--- a/drivers/block/ataflop.c
+++ b/drivers/block/ataflop.c
@@ -91,7 +91,6 @@
 #include <asm/atariints.h>
 #include <asm/atari_stdma.h>
 #include <asm/atari_stram.h>
-#include <linux/blk.h>
 #include <linux/blkpg.h>
 
 #define        FD_MAX_UNITS 2

diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 0316568..4a58ffd 100644 (file)
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -41,7 +41,6 @@
 #include <asm/uaccess.h>
 #include <asm/io.h>
 
-#include <linux/blk.h>
 #include <linux/blkdev.h>
 #include <linux/genhd.h>
 #include <linux/completion.h>

diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
index ade17d7..d1edabd 100644 (file)
--- a/drivers/block/cpqarray.c
+++ b/drivers/block/cpqarray.c
@@ -38,7 +38,6 @@
 #include <linux/init.h>
 #include <linux/hdreg.h>
 #include <linux/spinlock.h>
-#include <linux/blk.h>
 #include <linux/blkdev.h>
 #include <linux/genhd.h>
 #include <asm/uaccess.h>

diff --git a/drivers/block/cryptoloop.c b/drivers/block/cryptoloop.c
index b4ee0f5..d3ae3d0 100644 (file)
--- a/drivers/block/cryptoloop.c
+++ b/drivers/block/cryptoloop.c
@@ -26,7 +26,6 @@
 #include <linux/crypto.h>
 #include <linux/blkdev.h>
 #include <linux/loop.h>
-#include <linux/blk.h>
 #include <asm/semaphore.h>
 #include <asm/uaccess.h>
 

diff --git a/drivers/block/deadline-iosched.c b/drivers/block/deadline-iosched.c
index adc8db4..82d908a 100644 (file)
--- a/drivers/block/deadline-iosched.c
+++ b/drivers/block/deadline-iosched.c
@@ -10,7 +10,6 @@
 #include <linux/blkdev.h>
 #include <linux/elevator.h>
 #include <linux/bio.h>
-#include <linux/blk.h>
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/slab.h>

diff --git a/drivers/block/elevator.c b/drivers/block/elevator.c
index 485561a..a9bbb2f 100644 (file)
--- a/drivers/block/elevator.c
+++ b/drivers/block/elevator.c
@@ -29,7 +29,6 @@
 #include <linux/blkdev.h>
 #include <linux/elevator.h>
 #include <linux/bio.h>
-#include <linux/blk.h>
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/slab.h>

diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 40ff4c7..5fdb7ab 100644 (file)
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -242,7 +242,7 @@ static int irqdma_allocated;
 #define LOCAL_END_REQUEST
 #define DEVICE_NAME "floppy"
 
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/blkpg.h>
 #include <linux/cdrom.h> /* for the compatibility eject ioctl */
 #include <linux/completion.h>

diff --git a/drivers/block/floppy98.c b/drivers/block/floppy98.c
index b4b4624..ca6f4b9 100644 (file)
--- a/drivers/block/floppy98.c
+++ b/drivers/block/floppy98.c
@@ -277,7 +277,6 @@ static int irqdma_allocated;
 #define LOCAL_END_REQUEST
 #define DEVICE_NAME "floppy"
 
-#include <linux/blk.h>
 #include <linux/blkpg.h>
 #include <linux/cdrom.h> /* for the compatibility eject ioctl */
 #include <linux/completion.h>

diff --git a/drivers/block/genhd.c b/drivers/block/genhd.c
index 361aee8..953b177 100644 (file)
--- a/drivers/block/genhd.c
+++ b/drivers/block/genhd.c
@@ -7,7 +7,7 @@
 #include <linux/fs.h>
 #include <linux/genhd.h>
 #include <linux/kernel.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/init.h>
 #include <linux/spinlock.h>
 #include <linux/seq_file.h>

diff --git a/drivers/block/ioctl.c b/drivers/block/ioctl.c
index 79b75f1..ac31cbe 100644 (file)
--- a/drivers/block/ioctl.c
+++ b/drivers/block/ioctl.c
@@ -1,5 +1,5 @@
 #include <linux/sched.h>               /* for capable() */
-#include <linux/blk.h>                 /* for set_device_ro() */
+#include <linux/blkdev.h>
 #include <linux/blkpg.h>
 #include <linux/backing-dev.h>
 #include <linux/buffer_head.h>

diff --git a/drivers/block/ll_rw_blk.c b/drivers/block/ll_rw_blk.c
index 3d9ab7a..180ac3e 100644 (file)
--- a/drivers/block/ll_rw_blk.c
+++ b/drivers/block/ll_rw_blk.c
@@ -17,7 +17,7 @@
 #include <linux/module.h>
 #include <linux/backing-dev.h>
 #include <linux/bio.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/highmem.h>
 #include <linux/mm.h>
 #include <linux/kernel_stat.h>

diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 1c12b0f..cc9c34b 100644 (file)
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -44,7 +44,6 @@
 
 #include <linux/major.h>
 
-#include <linux/blk.h>
 #include <linux/blkdev.h>
 #include <linux/module.h>
 #include <linux/init.h>
@@ -55,8 +54,6 @@
 #include <linux/errno.h>
 #include <linux/file.h>
 #include <linux/ioctl.h>
-#include <linux/blkdev.h>
-#include <linux/blk.h>
 #include <net/sock.h>
 
 #include <linux/devfs_fs_kernel.h>

diff --git a/drivers/block/paride/pcd.c b/drivers/block/paride/pcd.c
index 2942558..0c317aa 100644 (file)
--- a/drivers/block/paride/pcd.c
+++ b/drivers/block/paride/pcd.c
@@ -137,7 +137,7 @@ enum {D_PRT, D_PRO, D_UNI, D_MOD, D_SLV, D_DLY};
 #include <linux/delay.h>
 #include <linux/cdrom.h>
 #include <linux/spinlock.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <asm/uaccess.h>
 
 static spinlock_t pcd_lock;

diff --git a/drivers/block/paride/pd.c b/drivers/block/paride/pd.c
index 2f488e6..0735bd7 100644 (file)
--- a/drivers/block/paride/pd.c
+++ b/drivers/block/paride/pd.c
@@ -150,7 +150,7 @@ enum {D_PRT, D_PRO, D_UNI, D_MOD, D_GEO, D_SBY, D_DLY, D_SLV};
 #include <linux/delay.h>
 #include <linux/hdreg.h>
 #include <linux/cdrom.h>       /* for the eject ioctl */
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/blkpg.h>
 #include <asm/uaccess.h>
 

diff --git a/drivers/block/paride/pf.c b/drivers/block/paride/pf.c
index 89d1246..4217504 100644 (file)
--- a/drivers/block/paride/pf.c
+++ b/drivers/block/paride/pf.c
@@ -150,7 +150,7 @@ enum {D_PRT, D_PRO, D_UNI, D_MOD, D_SLV, D_LUN, D_DLY};
 #include <linux/hdreg.h>
 #include <linux/cdrom.h>
 #include <linux/spinlock.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/blkpg.h>
 #include <asm/uaccess.h>
 

diff --git a/drivers/block/ps2esdi.c b/drivers/block/ps2esdi.c
index 03454cf..b3c1a27 100644 (file)
--- a/drivers/block/ps2esdi.c
+++ b/drivers/block/ps2esdi.c
@@ -38,7 +38,7 @@
 #include <linux/kernel.h>
 #include <linux/genhd.h>
 #include <linux/ps2esdi.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/mca.h>
 #include <linux/init.h>
 #include <linux/ioport.h>

diff --git a/drivers/block/swim3.c b/drivers/block/swim3.c
index 107633c..a3bd8fe 100644 (file)
--- a/drivers/block/swim3.c
+++ b/drivers/block/swim3.c
@@ -24,7 +24,6 @@
 #include <linux/delay.h>
 #include <linux/fd.h>
 #include <linux/ioctl.h>
-#include <linux/blk.h>
 #include <linux/devfs_fs_kernel.h>
 #include <asm/io.h>
 #include <asm/dbdma.h>

diff --git a/drivers/block/swim_iop.c b/drivers/block/swim_iop.c
index 958a333..e94607f 100644 (file)
--- a/drivers/block/swim_iop.c
+++ b/drivers/block/swim_iop.c
@@ -30,7 +30,6 @@
 #include <linux/timer.h>
 #include <linux/delay.h>
 #include <linux/fd.h>
-#include <linux/blk.h>
 #include <linux/ioctl.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>

diff --git a/drivers/block/umem.c b/drivers/block/umem.c
index 7bbed8b..a90d03f 100644 (file)
--- a/drivers/block/umem.c
+++ b/drivers/block/umem.c
@@ -99,7 +99,7 @@ static int pci_cmds;
 
 static int major_nr;
 
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/blkpg.h>
 
 struct cardinfo {

diff --git a/drivers/block/xd.c b/drivers/block/xd.c
index a73dd5a..016ee3b 100644 (file)
--- a/drivers/block/xd.c
+++ b/drivers/block/xd.c
@@ -46,7 +46,7 @@
 #include <linux/init.h>
 #include <linux/wait.h>
 #include <linux/devfs_fs_kernel.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/blkpg.h>
 
 #include <asm/system.h>

diff --git a/drivers/block/z2ram.c b/drivers/block/z2ram.c
index 5ec7675..a761f9f 100644 (file)
--- a/drivers/block/z2ram.c
+++ b/drivers/block/z2ram.c
@@ -30,7 +30,6 @@
 #include <linux/major.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
-#include <linux/blk.h>
 #include <linux/init.h>
 #include <linux/module.h>
 

diff --git a/drivers/cdrom/aztcd.c b/drivers/cdrom/aztcd.c
index 597368a..2eaabcf 100644 (file)
--- a/drivers/cdrom/aztcd.c
+++ b/drivers/cdrom/aztcd.c
@@ -166,7 +166,7 @@
 */
 
 #include <linux/version.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include "aztcd.h"
 
 #include <linux/module.h>

diff --git a/drivers/cdrom/cdu31a.c b/drivers/cdrom/cdu31a.c
index 4019e4b..29e3f12 100644 (file)
--- a/drivers/cdrom/cdu31a.c
+++ b/drivers/cdrom/cdu31a.c
@@ -177,7 +177,7 @@
 #include "cdu31a.h"
 
 #define MAJOR_NR CDU31A_CDROM_MAJOR
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 
 #define CDU31A_READAHEAD 4     /* 128 sector, 64kB, 32 reads read-ahead */
 #define CDU31A_MAX_CONSECUTIVE_ATTENTIONS 10

diff --git a/drivers/cdrom/cm206.c b/drivers/cdrom/cm206.c
index 1b8d168..42a6850 100644 (file)
--- a/drivers/cdrom/cm206.c
+++ b/drivers/cdrom/cm206.c
@@ -199,7 +199,7 @@ History:
 
 #define MAJOR_NR CM206_CDROM_MAJOR
 
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 
 #undef DEBUG
 #define STATISTICS             /* record times and frequencies of events */

diff --git a/drivers/cdrom/gscd.c b/drivers/cdrom/gscd.c
index 10c78c4..7396017 100644 (file)
--- a/drivers/cdrom/gscd.c
+++ b/drivers/cdrom/gscd.c
@@ -69,7 +69,7 @@
 #include <asm/uaccess.h>
 
 #define MAJOR_NR GOLDSTAR_CDROM_MAJOR
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #define gscd_port gscd         /* for compatible parameter passing with "insmod" */
 #include "gscd.h"
 

diff --git a/drivers/cdrom/mcd.c b/drivers/cdrom/mcd.c
index 5d538e6..58bb4df 100644 (file)
--- a/drivers/cdrom/mcd.c
+++ b/drivers/cdrom/mcd.c
@@ -101,7 +101,7 @@
 #include <asm/io.h>
 #include <asm/current.h>
 #include <asm/uaccess.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 
 #define mcd_port mcd           /* for compatible parameter passing with "insmod" */
 #include "mcd.h"

diff --git a/drivers/cdrom/mcdx.c b/drivers/cdrom/mcdx.c
index ca544f9..a6373e7 100644 (file)
--- a/drivers/cdrom/mcdx.c
+++ b/drivers/cdrom/mcdx.c
@@ -74,7 +74,7 @@ static const char *mcdx_c_version
 
 #include <linux/major.h>
 #define MAJOR_NR MITSUMI_X_CDROM_MAJOR
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/devfs_fs_kernel.h>
 
 /* for compatible parameter passing with "insmod" */

diff --git a/drivers/cdrom/optcd.c b/drivers/cdrom/optcd.c
index 6d107c7..74c0b43 100644 (file)
--- a/drivers/cdrom/optcd.c
+++ b/drivers/cdrom/optcd.c
@@ -73,7 +73,7 @@
 #include <linux/init.h>
 
 #include <asm/io.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 
 #include <linux/cdrom.h>
 #include "optcd.h"

diff --git a/drivers/cdrom/sbpcd.c b/drivers/cdrom/sbpcd.c
index ecc05b4..b79e3ef 100644 (file)
--- a/drivers/cdrom/sbpcd.c
+++ b/drivers/cdrom/sbpcd.c
@@ -387,7 +387,7 @@
 #include "sbpcd.h"
 
 #define MAJOR_NR MATSUSHITA_CDROM_MAJOR
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 
 /*==========================================================================*/
 #if SBPCD_DIS_IRQ

diff --git a/drivers/cdrom/sjcd.c b/drivers/cdrom/sjcd.c
index 21d6f85..190c43d 100644 (file)
--- a/drivers/cdrom/sjcd.c
+++ b/drivers/cdrom/sjcd.c
@@ -74,7 +74,7 @@
 #include <asm/system.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include "sjcd.h"
 
 static int sjcd_present = 0;

diff --git a/drivers/cdrom/sonycd535.c b/drivers/cdrom/sonycd535.c
index 5dc8597..f887f24 100644 (file)
--- a/drivers/cdrom/sonycd535.c
+++ b/drivers/cdrom/sonycd535.c
@@ -134,7 +134,7 @@
 #include <linux/cdrom.h>
 
 #define MAJOR_NR CDU535_CDROM_MAJOR
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 
 #define sony535_cd_base_io sonycd535 /* for compatible parameter passing with "insmod" */
 #include "sonycd535.h"

diff --git a/drivers/fc4/fc.c b/drivers/fc4/fc.c
index 82e3f67..f0da11b 100644 (file)
--- a/drivers/fc4/fc.c
+++ b/drivers/fc4/fc.c
@@ -33,7 +33,6 @@
 #include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/init.h>
-#include <linux/blk.h>
 
 #include <asm/pgtable.h>
 #include <asm/irq.h>

diff --git a/drivers/fc4/fcp_impl.h b/drivers/fc4/fcp_impl.h
index 7b8dc11..e44d652 100644 (file)
--- a/drivers/fc4/fcp_impl.h
+++ b/drivers/fc4/fcp_impl.h
@@ -8,7 +8,6 @@
 #define _FCP_SCSI_H
 
 #include <linux/types.h>
-#include <linux/blk.h>
 #include "../scsi/scsi.h"
 
 #include "fc.h"

diff --git a/drivers/ide/legacy/hd.c b/drivers/ide/legacy/hd.c
index ac8651d..4940ce0 100644 (file)
--- a/drivers/ide/legacy/hd.c
+++ b/drivers/ide/legacy/hd.c
@@ -26,7 +26,7 @@
 /* Uncomment the following if you want verbose error reports. */
 /* #define VERBOSE_ERRORS */
 
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/errno.h>
 #include <linux/signal.h>
 #include <linux/interrupt.h>

diff --git a/drivers/ide/legacy/hd98.c b/drivers/ide/legacy/hd98.c
index b8399d8..66e0619 100644 (file)
--- a/drivers/ide/legacy/hd98.c
+++ b/drivers/ide/legacy/hd98.c
@@ -46,8 +46,6 @@
 #include <asm/io.h>
 #include <asm/uaccess.h>
 
-#include <linux/blk.h>
-
 #include "io_ports.h"
 
 #ifdef __arm__

diff --git a/drivers/ide/ppc/mpc8xx.c b/drivers/ide/ppc/mpc8xx.c
index 35b745e..f1e8ad6 100644 (file)
--- a/drivers/ide/ppc/mpc8xx.c
+++ b/drivers/ide/ppc/mpc8xx.c
@@ -27,7 +27,6 @@
 #include <linux/interrupt.h>
 #include <linux/reboot.h>
 #include <linux/init.h>
-#include <linux/blk.h>
 #include <linux/ioport.h>
 #include <linux/ide.h>
 #include <linux/bootmem.h>

diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c
index e93e9e3..e56e9b2 100644 (file)
--- a/drivers/ieee1394/sbp2.c
+++ b/drivers/ieee1394/sbp2.c
@@ -52,7 +52,7 @@
 #include <linux/delay.h>
 #include <linux/sched.h>
 #include <linux/proc_fs.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/smp_lock.h>
 #include <linux/init.h>
 #include <linux/version.h>

diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
index 744c327..52f95fd 100644 (file)
--- a/drivers/md/dm-ioctl.c
+++ b/drivers/md/dm-ioctl.c
@@ -12,7 +12,6 @@
 #include <linux/dm-ioctl.h>
 #include <linux/init.h>
 #include <linux/wait.h>
-#include <linux/blk.h>
 #include <linux/slab.h>
 #include <linux/devfs_fs_kernel.h>
 

diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index 2a9ae0a..89e31d2 100644 (file)
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -8,7 +8,6 @@
 
 #include <linux/init.h>
 #include <linux/module.h>
-#include <linux/blk.h>
 #include <linux/blkpg.h>
 #include <linux/bio.h>
 #include <linux/mempool.h>

diff --git a/drivers/md/md.c b/drivers/md/md.c
index 7106b0f..72f114d 100644 (file)
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -52,8 +52,6 @@
 #define MD_DRIVER
 #define DEVICE_NR(device) (minor(device))
 
-#include <linux/blk.h>
-
 #define DEBUG 0
 #define dprintk(x...) ((void)(DEBUG && printk(x)))
 

diff --git a/drivers/message/fusion/mptctl.c b/drivers/message/fusion/mptctl.c
index 4a06bc4..1be377f 100644 (file)
--- a/drivers/message/fusion/mptctl.c
+++ b/drivers/message/fusion/mptctl.c
@@ -88,7 +88,6 @@
 
 #include <linux/kdev_t.h>      /* needed for access to Scsi_Host struct */
 #include <linux/blkdev.h>
-#include <linux/blk.h>          /* for io_request_lock (spinlock) decl */
 #include "../../scsi/scsi.h"
 #include "../../scsi/hosts.h"
 

diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
index f57624b..b50219c 100644 (file)
--- a/drivers/message/fusion/mptscsih.c
+++ b/drivers/message/fusion/mptscsih.c
@@ -72,7 +72,6 @@
 #include <linux/errno.h>
 #include <linux/kdev_t.h>
 #include <linux/blkdev.h>
-#include <linux/blk.h>         /* for io_request_lock (spinlock) decl */
 #include <linux/delay.h>       /* for mdelay */
 #include <linux/interrupt.h>   /* needed for in_interrupt() proto */
 #include <linux/reboot.h>      /* notifier code */

diff --git a/drivers/message/i2o/i2o_block.c b/drivers/message/i2o/i2o_block.c
index 6e81221..31b16b0 100644 (file)
--- a/drivers/message/i2o/i2o_block.c
+++ b/drivers/message/i2o/i2o_block.c
@@ -87,8 +87,6 @@
 
 #define MAJOR_NR I2O_MAJOR
 
-#include <linux/blk.h>
-
 #define MAX_I2OB       16
 
 #define MAX_I2OB_DEPTH 8

diff --git a/drivers/message/i2o/i2o_scsi.c b/drivers/message/i2o/i2o_scsi.c
index abb054d..5cbf96e 100644 (file)
--- a/drivers/message/i2o/i2o_scsi.c
+++ b/drivers/message/i2o/i2o_scsi.c
@@ -54,7 +54,7 @@
 #include <asm/system.h>
 #include <asm/io.h>
 #include <asm/atomic.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/i2o.h>
 #include "../../scsi/scsi.h"
 #include "../../scsi/hosts.h"

diff --git a/drivers/mtd/mtd_blkdevs.c b/drivers/mtd/mtd_blkdevs.c
index d156066..0474841 100644 (file)
--- a/drivers/mtd/mtd_blkdevs.c
+++ b/drivers/mtd/mtd_blkdevs.c
@@ -15,7 +15,6 @@
 #include <linux/mtd/blktrans.h>
 #include <linux/mtd/mtd.h>
 #include <linux/blkdev.h>
-#include <linux/blk.h>
 #include <linux/blkpg.h>
 #include <linux/spinlock.h>
 #include <linux/hdreg.h>

diff --git a/drivers/net/fc/iph5526.c b/drivers/net/fc/iph5526.c
index 4e9abfc..fbbc8ea 100644 (file)
--- a/drivers/net/fc/iph5526.c
+++ b/drivers/net/fc/iph5526.c
@@ -48,7 +48,6 @@ static const char *version =
 #include <linux/timer.h>
 #include <linux/spinlock.h>
 #include <linux/netdevice.h>
-#include <linux/blk.h>
 #include <linux/fcdevice.h> /* had the declarations for init_fcdev among
                               others + includes if_fcdevice.h */
 

diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index bdc27b3..676ef63 100644 (file)
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -16,7 +16,6 @@
 #include <linux/interrupt.h>
 #include <linux/ctype.h>
 #include <linux/major.h>
-#include <linux/blk.h>
 #include <linux/slab.h>
 #include <linux/buffer_head.h>
 

diff --git a/drivers/s390/block/dasd_genhd.c b/drivers/s390/block/dasd_genhd.c
index 2cb945b..521f54a 100644 (file)
--- a/drivers/s390/block/dasd_genhd.c
+++ b/drivers/s390/block/dasd_genhd.c
@@ -17,7 +17,6 @@
 #include <linux/interrupt.h>
 #include <linux/fs.h>
 #include <linux/blkpg.h>
-#include <linux/blk.h>
 
 #include <asm/uaccess.h>
 

diff --git a/drivers/s390/block/dasd_ioctl.c b/drivers/s390/block/dasd_ioctl.c
index 2c57596..bec92ca 100644 (file)
--- a/drivers/s390/block/dasd_ioctl.c
+++ b/drivers/s390/block/dasd_ioctl.c
@@ -14,7 +14,6 @@
 #include <linux/major.h>
 #include <linux/fs.h>
 #include <linux/blkpg.h>
-#include <linux/blk.h>
 
 #include <asm/ccwdev.h>
 #include <asm/uaccess.h>

diff --git a/drivers/s390/block/xpram.c b/drivers/s390/block/xpram.c
index 0f8e022..8455af9 100644 (file)
--- a/drivers/s390/block/xpram.c
+++ b/drivers/s390/block/xpram.c
@@ -31,7 +31,6 @@
 #include <linux/errno.h>
 #include <linux/init.h>
 #include <linux/slab.h>
-#include <linux/blk.h>
 #include <linux/blkpg.h>
 #include <linux/hdreg.h>  /* HDIO_GETGEO */
 #include <linux/sysdev.h>

diff --git a/drivers/s390/char/tape_block.c b/drivers/s390/char/tape_block.c
index 5427bac..13574d2 100644 (file)
--- a/drivers/s390/char/tape_block.c
+++ b/drivers/s390/char/tape_block.c
@@ -13,7 +13,6 @@
 #include <linux/version.h>
 #include <linux/module.h>
 #include <linux/blkdev.h>
-#include <linux/blk.h>
 #include <linux/interrupt.h>
 #include <linux/buffer_head.h>
 

diff --git a/drivers/sbus/char/jsflash.c b/drivers/sbus/char/jsflash.c
index 7d477c0..de72d0d 100644 (file)
--- a/drivers/sbus/char/jsflash.c
+++ b/drivers/sbus/char/jsflash.c
@@ -38,12 +38,8 @@
 #include <linux/smp_lock.h>
 #include <linux/genhd.h>
 
-/*
- * <linux/blk.h> is controlled from the outside with these definitions.
- */
 #define MAJOR_NR       JSFD_MAJOR
 
-#include <linux/blk.h>
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>
 #include <asm/io.h>

diff --git a/drivers/scsi/3w-xxxx.c b/drivers/scsi/3w-xxxx.c
index f4d5371..811f4c9 100644 (file)
--- a/drivers/scsi/3w-xxxx.c
+++ b/drivers/scsi/3w-xxxx.c
@@ -187,7 +187,7 @@ MODULE_LICENSE("GPL");
 #include <linux/proc_fs.h>
 #include <linux/sched.h>
 #include <linux/ioport.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/hdreg.h>
 #include <linux/string.h>
 #include <linux/delay.h>

diff --git a/drivers/scsi/53c700.c b/drivers/scsi/53c700.c
index 45d15d3..3e70fb9 100644 (file)
--- a/drivers/scsi/53c700.c
+++ b/drivers/scsi/53c700.c
@@ -131,7 +131,7 @@
 #include <asm/io.h>
 #include <asm/pgtable.h>
 #include <asm/byteorder.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/module.h>
 #include <linux/interrupt.h>
 

diff --git a/drivers/scsi/53c7xx.c b/drivers/scsi/53c7xx.c
index 64c2b34..cd53af0 100644 (file)
--- a/drivers/scsi/53c7xx.c
+++ b/drivers/scsi/53c7xx.c
@@ -249,7 +249,7 @@
 #include <linux/mm.h>
 #include <linux/ioport.h>
 #include <linux/time.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/spinlock.h>
 #include <linux/interrupt.h>
 #include <asm/pgtable.h>

diff --git a/drivers/scsi/AM53C974.c b/drivers/scsi/AM53C974.c
index 55a81bb..dbb273e 100644 (file)
--- a/drivers/scsi/AM53C974.c
+++ b/drivers/scsi/AM53C974.c
@@ -7,7 +7,7 @@
 #include <linux/errno.h>
 #include <linux/pci.h>
 #include <linux/string.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/init.h>
 #include <linux/spinlock.h>
 

diff --git a/drivers/scsi/BusLogic.c b/drivers/scsi/BusLogic.c
index c8dfeed..acaf2d9 100644 (file)
--- a/drivers/scsi/BusLogic.c
+++ b/drivers/scsi/BusLogic.c
@@ -36,7 +36,6 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/types.h>
-#include <linux/blk.h>
 #include <linux/blkdev.h>
 #include <linux/delay.h>
 #include <linux/ioport.h>

diff --git a/drivers/scsi/NCR53C9x.c b/drivers/scsi/NCR53C9x.c
index ac223b0..371fcbf 100644 (file)
--- a/drivers/scsi/NCR53C9x.c
+++ b/drivers/scsi/NCR53C9x.c
@@ -29,7 +29,7 @@
 #include <linux/types.h>
 #include <linux/string.h>
 #include <linux/slab.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/interrupt.h>
 #include <linux/proc_fs.h>
 #include <linux/stat.h>

diff --git a/drivers/scsi/NCR53c406a.c b/drivers/scsi/NCR53c406a.c
index f33795b..9583fda 100644 (file)
--- a/drivers/scsi/NCR53c406a.c
+++ b/drivers/scsi/NCR53c406a.c
@@ -51,7 +51,7 @@
 #include <asm/bitops.h>
 #include <asm/irq.h>
 
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/spinlock.h>
 #include "scsi.h"
 #include "hosts.h"

diff --git a/drivers/scsi/a2091.c b/drivers/scsi/a2091.c
index e8cb315..536df96 100644 (file)
--- a/drivers/scsi/a2091.c
+++ b/drivers/scsi/a2091.c
@@ -1,6 +1,6 @@
 #include <linux/types.h>
 #include <linux/mm.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/sched.h>
 #include <linux/version.h>
 #include <linux/init.h>

diff --git a/drivers/scsi/a3000.c b/drivers/scsi/a3000.c
index 073c406..28e661e 100644 (file)
--- a/drivers/scsi/a3000.c
+++ b/drivers/scsi/a3000.c
@@ -1,6 +1,6 @@
 #include <linux/types.h>
 #include <linux/mm.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/sched.h>
 #include <linux/version.h>
 #include <linux/ioport.h>

diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c
index bbc7cf7..6fe13d1 100644 (file)
--- a/drivers/scsi/aacraid/aachba.c
+++ b/drivers/scsi/aacraid/aachba.c
@@ -33,7 +33,7 @@
 #include <linux/completion.h>
 #include <asm/semaphore.h>
 #include <asm/uaccess.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include "scsi.h"
 #include "hosts.h"
 

diff --git a/drivers/scsi/aacraid/commctrl.c b/drivers/scsi/aacraid/commctrl.c
index 036783d..7e44a68 100644 (file)
--- a/drivers/scsi/aacraid/commctrl.c
+++ b/drivers/scsi/aacraid/commctrl.c
@@ -37,7 +37,7 @@
 #include <linux/spinlock.h>
 #include <linux/slab.h>
 #include <linux/completion.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <asm/semaphore.h>
 #include <asm/uaccess.h>
 #include "scsi.h"

diff --git a/drivers/scsi/aacraid/comminit.c b/drivers/scsi/aacraid/comminit.c
index 0f3360c..3509d87 100644 (file)
--- a/drivers/scsi/aacraid/comminit.c
+++ b/drivers/scsi/aacraid/comminit.c
@@ -37,7 +37,7 @@
 #include <linux/pci.h>
 #include <linux/spinlock.h>
 #include <linux/slab.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/completion.h>
 #include <linux/mm.h>
 #include <asm/semaphore.h>

diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c
index bdd46ce..85d43ec 100644 (file)
--- a/drivers/scsi/aacraid/commsup.c
+++ b/drivers/scsi/aacraid/commsup.c
@@ -41,7 +41,7 @@
 #include <linux/slab.h>
 #include <linux/completion.h>
 #include <asm/semaphore.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include "scsi.h"
 #include "hosts.h"
 

diff --git a/drivers/scsi/aacraid/dpcsup.c b/drivers/scsi/aacraid/dpcsup.c
index 901e4e0..e4fdddb 100644 (file)
--- a/drivers/scsi/aacraid/dpcsup.c
+++ b/drivers/scsi/aacraid/dpcsup.c
@@ -38,7 +38,7 @@
 #include <linux/spinlock.h>
 #include <linux/slab.h>
 #include <linux/completion.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <asm/semaphore.h>
 #include "scsi.h"
 #include "hosts.h"

diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
index 29e49b1..1328bbc 100644 (file)
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -50,7 +50,7 @@
 #include <linux/completion.h>
 #include <linux/interrupt.h>
 #include <asm/semaphore.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include "scsi.h"
 #include "hosts.h"
 #include <scsi/scsicam.h>

diff --git a/drivers/scsi/aacraid/rx.c b/drivers/scsi/aacraid/rx.c
index 5041b60..531a734 100644 (file)
--- a/drivers/scsi/aacraid/rx.c
+++ b/drivers/scsi/aacraid/rx.c
@@ -36,7 +36,7 @@
 #include <linux/pci.h>
 #include <linux/spinlock.h>
 #include <linux/slab.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/delay.h>
 #include <linux/completion.h>
 #include <linux/interrupt.h>

diff --git a/drivers/scsi/aacraid/sa.c b/drivers/scsi/aacraid/sa.c
index 10275e8..903a8bf 100644 (file)
--- a/drivers/scsi/aacraid/sa.c
+++ b/drivers/scsi/aacraid/sa.c
@@ -36,7 +36,7 @@
 #include <linux/pci.h>
 #include <linux/spinlock.h>
 #include <linux/slab.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/delay.h>
 #include <linux/completion.h>
 #include <linux/interrupt.h>

diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c
index f05ec19..3c62aa6 100644 (file)
--- a/drivers/scsi/advansys.c
+++ b/drivers/scsi/advansys.c
@@ -798,7 +798,7 @@
 #include <linux/mm.h>
 #include <linux/proc_fs.h>
 #include <linux/init.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/stat.h>
 #include <linux/spinlock.h>
 

diff --git a/drivers/scsi/aha152x.c b/drivers/scsi/aha152x.c
index b3ae253..ee380d8 100644 (file)
--- a/drivers/scsi/aha152x.c
+++ b/drivers/scsi/aha152x.c
@@ -225,7 +225,7 @@
 #include <asm/irq.h>
 #include <asm/io.h>
 #include <linux/version.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include "scsi.h"
 #include "hosts.h"
 #include <asm/system.h>
@@ -241,9 +241,7 @@
 #include <linux/isapnp.h>
 #include <linux/spinlock.h>
 #include <linux/workqueue.h>
-#include <linux/blk.h>
 #include <asm/semaphore.h>
-#include <asm/io.h>
 #include <scsi/scsicam.h>
 
 #include "scsi.h"

diff --git a/drivers/scsi/aha1542.c b/drivers/scsi/aha1542.c
index 0014ce5..ad24ddc 100644 (file)
--- a/drivers/scsi/aha1542.c
+++ b/drivers/scsi/aha1542.c
@@ -38,7 +38,7 @@
 #include <linux/spinlock.h>
 #include <linux/pci.h>
 #include <linux/isapnp.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/mca.h>
 #include <linux/mca-legacy.h>
 

diff --git a/drivers/scsi/aha1740.c b/drivers/scsi/aha1740.c
index 20455be..fe22bc3 100644 (file)
--- a/drivers/scsi/aha1740.c
+++ b/drivers/scsi/aha1740.c
@@ -34,7 +34,7 @@
  * are deemed to be part of the source code.
  */
 
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/kernel.h>

diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.h b/drivers/scsi/aic7xxx/aic79xx_osm.h
index 8e99aa2..8e98906 100644 (file)
--- a/drivers/scsi/aic7xxx/aic79xx_osm.h
+++ b/drivers/scsi/aic7xxx/aic79xx_osm.h
@@ -43,7 +43,6 @@
 #define _AIC79XX_LINUX_H_
 
 #include <linux/types.h>
-#include <linux/blk.h>
 #include <linux/blkdev.h>
 #include <linux/delay.h>
 #include <linux/ioport.h>

diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c
index 9e1c586..a2ec0a9 100644 (file)
--- a/drivers/scsi/aic7xxx/aic7xxx_osm.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm.c
@@ -139,7 +139,7 @@
 #endif
 
 #include <linux/mm.h>          /* For fetching system memory size */
-#include <linux/blk.h>         /* For block_size() */
+#include <linux/blkdev.h>              /* For block_size() */
 
 /*
  * Lock protecting manipulation of the ahc softc list.

diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.h b/drivers/scsi/aic7xxx/aic7xxx_osm.h
index 4144226..76cc447 100644 (file)
--- a/drivers/scsi/aic7xxx/aic7xxx_osm.h
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm.h
@@ -60,7 +60,6 @@
 #define _AIC7XXX_LINUX_H_
 
 #include <linux/types.h>
-#include <linux/blk.h>
 #include <linux/blkdev.h>
 #include <linux/delay.h>
 #include <linux/ioport.h>

diff --git a/drivers/scsi/aic7xxx/aiclib.c b/drivers/scsi/aic7xxx/aiclib.c
index e2d13f7..68a1633 100644 (file)
--- a/drivers/scsi/aic7xxx/aiclib.c
+++ b/drivers/scsi/aic7xxx/aiclib.c
@@ -30,7 +30,6 @@
  * $Id$
  */
 
-#include <linux/blk.h>
 #include <linux/blkdev.h>
 #include <linux/delay.h>
 #include <linux/version.h>

diff --git a/drivers/scsi/aic7xxx_old.c b/drivers/scsi/aic7xxx_old.c
index efaa1d9..079979b 100644 (file)
--- a/drivers/scsi/aic7xxx_old.c
+++ b/drivers/scsi/aic7xxx_old.c
@@ -233,11 +233,10 @@
 #include <linux/sched.h>
 #include <linux/pci.h>
 #include <linux/proc_fs.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/init.h>
 #include <linux/spinlock.h>
 #include <linux/smp.h>
-#include <linux/blk.h>
 #include <linux/interrupt.h>
 #include "scsi.h"
 #include "hosts.h"

diff --git a/drivers/scsi/amiga7xx.c b/drivers/scsi/amiga7xx.c
index 78a2866..9d92673 100644 (file)
--- a/drivers/scsi/amiga7xx.c
+++ b/drivers/scsi/amiga7xx.c
@@ -9,7 +9,7 @@
  */
 #include <linux/types.h>
 #include <linux/mm.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/sched.h>
 #include <linux/version.h>
 #include <linux/config.h>

diff --git a/drivers/scsi/arm/acornscsi.c b/drivers/scsi/arm/acornscsi.c
index ff23d71..7ac9e31 100644 (file)
--- a/drivers/scsi/arm/acornscsi.c
+++ b/drivers/scsi/arm/acornscsi.c
@@ -138,7 +138,7 @@
 #include <linux/errno.h>
 #include <linux/proc_fs.h>
 #include <linux/ioport.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include <linux/init.h>

diff --git a/drivers/scsi/arm/arxescsi.c b/drivers/scsi/arm/arxescsi.c
index 724c253..0e25ee7 100644 (file)
--- a/drivers/scsi/arm/arxescsi.c
+++ b/drivers/scsi/arm/arxescsi.c
@@ -19,7 +19,7 @@
  *  22-10-2000  SH             Updated for new registering scheme.
  */
 #include <linux/module.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/ioport.h>

diff --git a/drivers/scsi/arm/cumana_1.c b/drivers/scsi/arm/cumana_1.c
index b7c9f13..35b1488 100644 (file)
--- a/drivers/scsi/arm/cumana_1.c
+++ b/drivers/scsi/arm/cumana_1.c
@@ -8,7 +8,7 @@
 #include <linux/sched.h>
 #include <linux/ioport.h>
 #include <linux/delay.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/init.h>
 
 #include <asm/ecard.h>

diff --git a/drivers/scsi/arm/cumana_2.c b/drivers/scsi/arm/cumana_2.c
index c0a6a90..1266b23 100644 (file)
--- a/drivers/scsi/arm/cumana_2.c
+++ b/drivers/scsi/arm/cumana_2.c
@@ -17,7 +17,7 @@
  *   02-04-2000        RMK     0.0.4   Updated for new error handling code.
  */
 #include <linux/module.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/ioport.h>

diff --git a/drivers/scsi/arm/ecoscsi.c b/drivers/scsi/arm/ecoscsi.c
index 9b88a2e..ec1571c 100644 (file)
--- a/drivers/scsi/arm/ecoscsi.c
+++ b/drivers/scsi/arm/ecoscsi.c
@@ -27,7 +27,7 @@
 #include <linux/ioport.h>
 #include <linux/delay.h>
 #include <linux/init.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 
 #include <asm/io.h>
 #include <asm/system.h>

diff --git a/drivers/scsi/arm/eesox.c b/drivers/scsi/arm/eesox.c
index c1c04ab..96ddffd 100644 (file)
--- a/drivers/scsi/arm/eesox.c
+++ b/drivers/scsi/arm/eesox.c
@@ -23,7 +23,7 @@
  *                             error handling code.
  */
 #include <linux/module.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/ioport.h>

diff --git a/drivers/scsi/arm/fas216.c b/drivers/scsi/arm/fas216.c
index 6ba029a..11a733d 100644 (file)
--- a/drivers/scsi/arm/fas216.c
+++ b/drivers/scsi/arm/fas216.c
@@ -35,7 +35,7 @@
  *                     condition status from targets.
  */
 #include <linux/module.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/ioport.h>

diff --git a/drivers/scsi/arm/oak.c b/drivers/scsi/arm/oak.c
index 7669085..34a5432 100644 (file)
--- a/drivers/scsi/arm/oak.c
+++ b/drivers/scsi/arm/oak.c
@@ -9,7 +9,7 @@
 #include <linux/sched.h>
 #include <linux/ioport.h>
 #include <linux/delay.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/init.h>
 
 #include <asm/ecard.h>

diff --git a/drivers/scsi/arm/powertec.c b/drivers/scsi/arm/powertec.c
index 3132086..1b26af7 100644 (file)
--- a/drivers/scsi/arm/powertec.c
+++ b/drivers/scsi/arm/powertec.c
@@ -8,7 +8,7 @@
  * published by the Free Software Foundation.
  */
 #include <linux/module.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/ioport.h>

diff --git a/drivers/scsi/arm/queue.c b/drivers/scsi/arm/queue.c
index fec52a7..e6d1592 100644 (file)
--- a/drivers/scsi/arm/queue.c
+++ b/drivers/scsi/arm/queue.c
@@ -15,7 +15,7 @@
  *   30-Aug-2000 RMK   Use Linux list handling and spinlocks
  */
 #include <linux/module.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/slab.h>

diff --git a/drivers/scsi/atari_scsi.c b/drivers/scsi/atari_scsi.c
index dffe97e..f44a473 100644 (file)
--- a/drivers/scsi/atari_scsi.c
+++ b/drivers/scsi/atari_scsi.c
@@ -86,7 +86,7 @@
 #include <linux/ctype.h>
 #include <linux/delay.h>
 #include <linux/mm.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/sched.h>
 #include <linux/interrupt.h>
 #include <linux/init.h>

diff --git a/drivers/scsi/atp870u.c b/drivers/scsi/atp870u.c
index dd46f64..9e0ac1b 100644 (file)
--- a/drivers/scsi/atp870u.c
+++ b/drivers/scsi/atp870u.c
@@ -26,7 +26,7 @@
 #include <linux/proc_fs.h>
 #include <linux/spinlock.h>
 #include <linux/pci.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/stat.h>
 
 #include <asm/system.h>

diff --git a/drivers/scsi/blz1230.c b/drivers/scsi/blz1230.c
index 615ad76..58dc21d 100644 (file)
--- a/drivers/scsi/blz1230.c
+++ b/drivers/scsi/blz1230.c
@@ -22,7 +22,7 @@
 #include <linux/types.h>
 #include <linux/string.h>
 #include <linux/slab.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/proc_fs.h>
 #include <linux/stat.h>
 #include <linux/interrupt.h>

diff --git a/drivers/scsi/blz2060.c b/drivers/scsi/blz2060.c
index 77f77e9..b6f6b53 100644 (file)
--- a/drivers/scsi/blz2060.c
+++ b/drivers/scsi/blz2060.c
@@ -22,7 +22,7 @@
 #include <linux/types.h>
 #include <linux/string.h>
 #include <linux/slab.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/proc_fs.h>
 #include <linux/stat.h>
 #include <linux/interrupt.h>

diff --git a/drivers/scsi/bvme6000.c b/drivers/scsi/bvme6000.c
index c47cbc1..9927115 100644 (file)
--- a/drivers/scsi/bvme6000.c
+++ b/drivers/scsi/bvme6000.c
@@ -5,7 +5,7 @@
  */
 #include <linux/types.h>
 #include <linux/mm.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/sched.h>
 #include <linux/version.h>
 #include <linux/zorro.h>

diff --git a/drivers/scsi/constants.c b/drivers/scsi/constants.c
index 76bd389..125af65 100644 (file)
--- a/drivers/scsi/constants.c
+++ b/drivers/scsi/constants.c
@@ -9,7 +9,7 @@
 #include <linux/module.h>
 
 #include <linux/config.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/kernel.h>
 #include "scsi.h"
 #include "hosts.h"

diff --git a/drivers/scsi/cpqfcTScontrol.c b/drivers/scsi/cpqfcTScontrol.c
index 0945a44..2c195ee 100644 (file)
--- a/drivers/scsi/cpqfcTScontrol.c
+++ b/drivers/scsi/cpqfcTScontrol.c
@@ -30,7 +30,7 @@
 
 #define LinuxVersionCode(v, p, s) (((v)<<16)+((p)<<8)+(s))
 
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/ioport.h>  // request_region() prototype

diff --git a/drivers/scsi/cpqfcTSinit.c b/drivers/scsi/cpqfcTSinit.c
index a308618..9a519af 100644 (file)
--- a/drivers/scsi/cpqfcTSinit.c
+++ b/drivers/scsi/cpqfcTSinit.c
@@ -35,7 +35,7 @@
 #include <linux/interrupt.h>  
 #include <linux/module.h>
 #include <linux/version.h> 
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/types.h>

diff --git a/drivers/scsi/cpqfcTSworker.c b/drivers/scsi/cpqfcTSworker.c
index 7f5b643..553d015 100644 (file)
--- a/drivers/scsi/cpqfcTSworker.c
+++ b/drivers/scsi/cpqfcTSworker.c
@@ -26,7 +26,7 @@
 #include <linux/ioport.h>
 #include <linux/kernel.h>
 #include <linux/stat.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/interrupt.h>
 #include <linux/delay.h>
 #include <linux/smp_lock.h>

diff --git a/drivers/scsi/cyberstorm.c b/drivers/scsi/cyberstorm.c
index e795eeb..afda0ea 100644 (file)
--- a/drivers/scsi/cyberstorm.c
+++ b/drivers/scsi/cyberstorm.c
@@ -25,7 +25,7 @@
 #include <linux/types.h>
 #include <linux/string.h>
 #include <linux/slab.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/proc_fs.h>
 #include <linux/stat.h>
 #include <linux/interrupt.h>

diff --git a/drivers/scsi/cyberstormII.c b/drivers/scsi/cyberstormII.c
index 4d0bf3e..96e97c0 100644 (file)
--- a/drivers/scsi/cyberstormII.c
+++ b/drivers/scsi/cyberstormII.c
@@ -21,7 +21,7 @@
 #include <linux/types.h>
 #include <linux/string.h>
 #include <linux/slab.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/proc_fs.h>
 #include <linux/stat.h>
 #include <linux/interrupt.h>

diff --git a/drivers/scsi/dc395x.c b/drivers/scsi/dc395x.c
index df68446..65c9467 100644 (file)
--- a/drivers/scsi/dc395x.c
+++ b/drivers/scsi/dc395x.c
@@ -50,7 +50,7 @@
 #include <linux/moduleparam.h>
 #include <linux/delay.h>
 #include <linux/ctype.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <asm/io.h>
 #include "scsi.h"
 #include "hosts.h"

diff --git a/drivers/scsi/dec_esp.c b/drivers/scsi/dec_esp.c
index 67e6de3..972b308 100644 (file)
--- a/drivers/scsi/dec_esp.c
+++ b/drivers/scsi/dec_esp.c
@@ -24,7 +24,7 @@
 #include <linux/types.h>
 #include <linux/string.h>
 #include <linux/slab.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/proc_fs.h>
 #include <linux/stat.h>
 

diff --git a/drivers/scsi/dmx3191d.c b/drivers/scsi/dmx3191d.c
index d048db7..5c50a09 100644 (file)
--- a/drivers/scsi/dmx3191d.c
+++ b/drivers/scsi/dmx3191d.c
@@ -22,7 +22,7 @@
 
 #include <asm/io.h>
 #include <asm/system.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/init.h>
 #include <linux/ioport.h>
 #include <linux/module.h>

diff --git a/drivers/scsi/dpt_i2o.c b/drivers/scsi/dpt_i2o.c
index 79751a7..abfa675 100644 (file)
--- a/drivers/scsi/dpt_i2o.c
+++ b/drivers/scsi/dpt_i2o.c
@@ -47,7 +47,7 @@ MODULE_DESCRIPTION("Adaptec I2O RAID Driver");
 #include <linux/config.h>      /* for CONFIG_PCI */
 #include <linux/pci.h>         /* for PCI support */
 #include <linux/proc_fs.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/delay.h>       /* for udelay */
 #include <linux/interrupt.h>
 #include <linux/kernel.h>      /* for printk */

diff --git a/drivers/scsi/dtc.c b/drivers/scsi/dtc.c
index f9dc04e..820ac1f 100644 (file)
--- a/drivers/scsi/dtc.c
+++ b/drivers/scsi/dtc.c
@@ -76,7 +76,7 @@
 #include <linux/module.h>
 #include <linux/signal.h>
 #include <linux/sched.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/delay.h>
 #include <linux/stat.h>
 #include <linux/string.h>

diff --git a/drivers/scsi/eata.c b/drivers/scsi/eata.c
index f3d7c97..a27ed9b 100644 (file)
--- a/drivers/scsi/eata.c
+++ b/drivers/scsi/eata.c
@@ -486,7 +486,7 @@
 #include <asm/system.h>
 #include <asm/byteorder.h>
 #include <linux/proc_fs.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/interrupt.h>
 #include <linux/stat.h>
 #include <linux/pci.h>

diff --git a/drivers/scsi/eata_pio.c b/drivers/scsi/eata_pio.c
index 958da8b..02b9920 100644 (file)
--- a/drivers/scsi/eata_pio.c
+++ b/drivers/scsi/eata_pio.c
@@ -58,7 +58,7 @@
 #include <linux/interrupt.h>
 #include <linux/stat.h>
 #include <linux/config.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/spinlock.h>
 #include <asm/io.h>
 

diff --git a/drivers/scsi/esp.c b/drivers/scsi/esp.c
index 543ea4a..2af4fe0 100644 (file)
--- a/drivers/scsi/esp.c
+++ b/drivers/scsi/esp.c
@@ -19,7 +19,7 @@
 #include <linux/types.h>
 #include <linux/string.h>
 #include <linux/slab.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/proc_fs.h>
 #include <linux/stat.h>
 #include <linux/init.h>

diff --git a/drivers/scsi/fastlane.c b/drivers/scsi/fastlane.c
index 62a473c..6f9cfad 100644 (file)
--- a/drivers/scsi/fastlane.c
+++ b/drivers/scsi/fastlane.c
@@ -30,7 +30,7 @@
 #include <linux/types.h>
 #include <linux/string.h>
 #include <linux/slab.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/proc_fs.h>
 #include <linux/stat.h>
 #include <linux/interrupt.h>

diff --git a/drivers/scsi/fcal.c b/drivers/scsi/fcal.c
index fb69527..def603d 100644 (file)
--- a/drivers/scsi/fcal.c
+++ b/drivers/scsi/fcal.c
@@ -9,7 +9,7 @@
 #include <linux/types.h>
 #include <linux/string.h>
 #include <linux/slab.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/proc_fs.h>
 #include <linux/stat.h>
 #include <linux/init.h>

diff --git a/drivers/scsi/fd_mcs.c b/drivers/scsi/fd_mcs.c
index 4ca10ec..4060e29 100644 (file)
--- a/drivers/scsi/fd_mcs.c
+++ b/drivers/scsi/fd_mcs.c
@@ -79,7 +79,7 @@
 
 #include <linux/module.h>
 #include <linux/interrupt.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/ioport.h>

diff --git a/drivers/scsi/fdomain.c b/drivers/scsi/fdomain.c
index a489edf..7b53d00 100644 (file)
--- a/drivers/scsi/fdomain.c
+++ b/drivers/scsi/fdomain.c
@@ -270,7 +270,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/spinlock.h>
 #include <linux/errno.h>
 #include <linux/string.h>

diff --git a/drivers/scsi/g_NCR5380.c b/drivers/scsi/g_NCR5380.c
index 083b7e6..0985bd1 100644 (file)
--- a/drivers/scsi/g_NCR5380.c
+++ b/drivers/scsi/g_NCR5380.c
@@ -105,7 +105,7 @@
 #include <asm/io.h>
 #include <linux/signal.h>
 #include <linux/sched.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include "scsi.h"
 #include "hosts.h"
 #include "g_NCR5380.h"

diff --git a/drivers/scsi/gdth.c b/drivers/scsi/gdth.c
index ac72805..0155fa7 100644 (file)
--- a/drivers/scsi/gdth.c
+++ b/drivers/scsi/gdth.c
@@ -357,11 +357,8 @@
 #include <asm/spinlock.h>
 #endif
 
-#if LINUX_VERSION_CODE >= 0x010300
-#include <linux/blk.h>
-#else
-#include "../block/blk.h"
-#endif
+#include <linux/blkdev.h>
+
 #include "scsi.h"
 #include "hosts.h"
 #if LINUX_VERSION_CODE < 0x020503

diff --git a/drivers/scsi/gvp11.c b/drivers/scsi/gvp11.c
index cbfba8b..23934ca 100644 (file)
--- a/drivers/scsi/gvp11.c
+++ b/drivers/scsi/gvp11.c
@@ -1,6 +1,6 @@
 #include <linux/types.h>
 #include <linux/mm.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/sched.h>
 #include <linux/version.h>
 #include <linux/init.h>

diff --git a/drivers/scsi/i91uscsi.c b/drivers/scsi/i91uscsi.c
index 6659bc0..1bbffe5 100644 (file)
--- a/drivers/scsi/i91uscsi.c
+++ b/drivers/scsi/i91uscsi.c
@@ -81,7 +81,7 @@
 
 #include <linux/jiffies.h>
 #include <linux/delay.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <asm/io.h>
 
 #include "i91uscsi.h"

diff --git a/drivers/scsi/ibmmca.c b/drivers/scsi/ibmmca.c
index 4642757..9503802 100644 (file)
--- a/drivers/scsi/ibmmca.c
+++ b/drivers/scsi/ibmmca.c
@@ -32,7 +32,7 @@
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
 #include <linux/delay.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/proc_fs.h>
 #include <linux/stat.h>
 #include <linux/mca.h>

diff --git a/drivers/scsi/imm.c b/drivers/scsi/imm.c
index 7c3ac1d..3c8377c 100644 (file)
--- a/drivers/scsi/imm.c
+++ b/drivers/scsi/imm.c
@@ -24,7 +24,7 @@
 void imm_reset_pulse(unsigned int base);
 static int device_check(int host_no);
 
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <asm/io.h>
 #include <linux/parport.h>
 #include <linux/workqueue.h>

diff --git a/drivers/scsi/imm.h b/drivers/scsi/imm.h
index 4305d91..77368b1 100644 (file)
--- a/drivers/scsi/imm.h
+++ b/drivers/scsi/imm.h
@@ -75,7 +75,7 @@
 #include  <linux/delay.h>
 #include  <linux/proc_fs.h>
 #include  <linux/stat.h>
-#include  <linux/blk.h>
+#include  <linux/blkdev.h>
 #include  <linux/sched.h>
 #include  <linux/interrupt.h>
 

diff --git a/drivers/scsi/in2000.c b/drivers/scsi/in2000.c
index 58024bf..f73e47e 100644 (file)
--- a/drivers/scsi/in2000.c
+++ b/drivers/scsi/in2000.c
@@ -114,7 +114,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/blk.h>
 #include <linux/blkdev.h>
 #include <linux/interrupt.h>
 #include <linux/string.h>

diff --git a/drivers/scsi/ini9100u.c b/drivers/scsi/ini9100u.c
index 665a9aa..152e26a 100644 (file)
--- a/drivers/scsi/ini9100u.c
+++ b/drivers/scsi/ini9100u.c
@@ -119,7 +119,7 @@
 #include <linux/delay.h>
 #include <linux/pci.h>
 #include <linux/init.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/spinlock.h>
 #include <linux/stat.h>
 #include <linux/config.h>

diff --git a/drivers/scsi/inia100.c b/drivers/scsi/inia100.c
index c8a2502..5360de6 100644 (file)
--- a/drivers/scsi/inia100.c
+++ b/drivers/scsi/inia100.c
@@ -74,7 +74,7 @@
 #include <linux/interrupt.h>
 #include <linux/pci.h>
 #include <linux/init.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/spinlock.h>
 #include <linux/stat.h>
 #include <linux/kernel.h>

diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c
index f8b6a0c..6fe5b54 100644 (file)
--- a/drivers/scsi/ips.c
+++ b/drivers/scsi/ips.c
@@ -167,7 +167,7 @@
 #include <linux/reboot.h>
 #include <linux/interrupt.h>
 
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/types.h>
 
 #include <scsi/sg.h>

diff --git a/drivers/scsi/jazz_esp.c b/drivers/scsi/jazz_esp.c
index a42cd20..1d2e627 100644 (file)
--- a/drivers/scsi/jazz_esp.c
+++ b/drivers/scsi/jazz_esp.c
@@ -11,7 +11,7 @@
 #include <linux/types.h>
 #include <linux/string.h>
 #include <linux/slab.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/proc_fs.h>
 #include <linux/stat.h>
 

diff --git a/drivers/scsi/mac53c94.c b/drivers/scsi/mac53c94.c
index 34b5522..373e2dd 100644 (file)
--- a/drivers/scsi/mac53c94.c
+++ b/drivers/scsi/mac53c94.c
@@ -12,7 +12,7 @@
 #include <linux/types.h>
 #include <linux/string.h>
 #include <linux/slab.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/proc_fs.h>
 #include <linux/stat.h>
 #include <linux/spinlock.h>

diff --git a/drivers/scsi/mac_esp.c b/drivers/scsi/mac_esp.c
index f929dcd..d028d17 100644 (file)
--- a/drivers/scsi/mac_esp.c
+++ b/drivers/scsi/mac_esp.c
@@ -19,7 +19,7 @@
 #include <linux/ctype.h>
 #include <linux/string.h>
 #include <linux/slab.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/proc_fs.h>
 #include <linux/stat.h>
 #include <linux/init.h>

diff --git a/drivers/scsi/mac_scsi.c b/drivers/scsi/mac_scsi.c
index 812bc17..809c8e4 100644 (file)
--- a/drivers/scsi/mac_scsi.c
+++ b/drivers/scsi/mac_scsi.c
@@ -39,7 +39,7 @@
 #include <linux/sched.h>
 #include <linux/ioport.h>
 #include <linux/init.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/interrupt.h>
 
 #include <asm/io.h>

diff --git a/drivers/scsi/mca_53c9x.c b/drivers/scsi/mca_53c9x.c
index c4374db..e1ad922 100644 (file)
--- a/drivers/scsi/mca_53c9x.c
+++ b/drivers/scsi/mca_53c9x.c
@@ -37,7 +37,7 @@
 #include <linux/types.h>
 #include <linux/string.h>
 #include <linux/slab.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/proc_fs.h>
 #include <linux/stat.h>
 #include <linux/mca-legacy.h>

diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c
index 62d6860..6dfaf6b 100644 (file)
--- a/drivers/scsi/megaraid.c
+++ b/drivers/scsi/megaraid.c
@@ -32,7 +32,7 @@
 
 #include <linux/mm.h>
 #include <linux/fs.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
 #include <linux/delay.h>

diff --git a/drivers/scsi/mesh.c b/drivers/scsi/mesh.c
index 6aaa7ef..e9dae68 100644 (file)
--- a/drivers/scsi/mesh.c
+++ b/drivers/scsi/mesh.c
@@ -21,7 +21,7 @@
 #include <linux/types.h>
 #include <linux/string.h>
 #include <linux/slab.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/proc_fs.h>
 #include <linux/stat.h>
 #include <linux/interrupt.h>

diff --git a/drivers/scsi/mvme147.c b/drivers/scsi/mvme147.c
index e7c6d9c..62ec056 100644 (file)
--- a/drivers/scsi/mvme147.c
+++ b/drivers/scsi/mvme147.c
@@ -1,6 +1,6 @@
 #include <linux/types.h>
 #include <linux/mm.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/sched.h>
 #include <linux/version.h>
 #include <linux/interrupt.h>

diff --git a/drivers/scsi/mvme16x.c b/drivers/scsi/mvme16x.c
index 25d3e72..fd17e40 100644 (file)
--- a/drivers/scsi/mvme16x.c
+++ b/drivers/scsi/mvme16x.c
@@ -5,7 +5,7 @@
  */
 #include <linux/types.h>
 #include <linux/mm.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/sched.h>
 #include <linux/version.h>
 

diff --git a/drivers/scsi/ncr53c8xx.c b/drivers/scsi/ncr53c8xx.c
index 90a7183..7c080e9 100644 (file)
--- a/drivers/scsi/ncr53c8xx.c
+++ b/drivers/scsi/ncr53c8xx.c
@@ -140,7 +140,7 @@
 #include <linux/timer.h>
 #include <linux/stat.h>
 
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,35)
 #include <linux/init.h>

diff --git a/drivers/scsi/nsp32.c b/drivers/scsi/nsp32.c
index 80021bc..963e409 100644 (file)
--- a/drivers/scsi/nsp32.c
+++ b/drivers/scsi/nsp32.c
@@ -25,7 +25,7 @@
 #include <linux/timer.h>
 #include <linux/ioport.h>
 #include <linux/major.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/interrupt.h>
 #include <linux/pci.h>
 #include <linux/delay.h>

diff --git a/drivers/scsi/oktagon_esp.c b/drivers/scsi/oktagon_esp.c
index 14c983e..e021d56 100644 (file)
--- a/drivers/scsi/oktagon_esp.c
+++ b/drivers/scsi/oktagon_esp.c
@@ -20,7 +20,7 @@
 #include <linux/types.h>
 #include <linux/string.h>
 #include <linux/slab.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/proc_fs.h>
 #include <linux/stat.h>
 #include <linux/reboot.h>

diff --git a/drivers/scsi/osst.c b/drivers/scsi/osst.c
index 445d38f..1c238c4 100644 (file)
--- a/drivers/scsi/osst.c
+++ b/drivers/scsi/osst.c
@@ -46,7 +46,7 @@ const char * osst_version = "0.99.0";
 #include <linux/spinlock.h>
 #include <linux/vmalloc.h>
 #include <linux/version.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/devfs_fs_kernel.h>
 #include <asm/uaccess.h>
 #include <asm/dma.h>

diff --git a/drivers/scsi/pas16.c b/drivers/scsi/pas16.c
index 3826816..3266488 100644 (file)
--- a/drivers/scsi/pas16.c
+++ b/drivers/scsi/pas16.c
@@ -117,7 +117,7 @@
 #include <linux/proc_fs.h>
 #include <linux/sched.h>
 #include <asm/io.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include <linux/stat.h>

diff --git a/drivers/scsi/pc980155.c b/drivers/scsi/pc980155.c
index c6bd107..046b5c3 100644 (file)
--- a/drivers/scsi/pc980155.c
+++ b/drivers/scsi/pc980155.c
@@ -11,7 +11,7 @@
  */
 
 #include <linux/module.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/ioport.h>
 #include <linux/interrupt.h>
 #include <linux/types.h>

diff --git a/drivers/scsi/pci2000.c b/drivers/scsi/pci2000.c
index 9477f6e..7891f61 100644 (file)
--- a/drivers/scsi/pci2000.c
+++ b/drivers/scsi/pci2000.c
@@ -35,7 +35,7 @@
  ****************************************************************************/
 #define PCI2000_VERSION                "1.20"
 
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/kernel.h>

diff --git a/drivers/scsi/pci2220i.c b/drivers/scsi/pci2220i.c
index 1d8dd53..145e911 100644 (file)
--- a/drivers/scsi/pci2220i.c
+++ b/drivers/scsi/pci2220i.c
@@ -50,7 +50,7 @@
 #include <linux/sched.h>
 #include <linux/proc_fs.h>
 #include <linux/stat.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/timer.h>
 #include <linux/spinlock.h>
 

diff --git a/drivers/scsi/pcmcia/aha152x_stub.c b/drivers/scsi/pcmcia/aha152x_stub.c
index 03a2aca..41f4203 100644 (file)
--- a/drivers/scsi/pcmcia/aha152x_stub.c
+++ b/drivers/scsi/pcmcia/aha152x_stub.c
@@ -44,7 +44,7 @@
 #include <linux/ioport.h>
 #include <scsi/scsi.h>
 #include <linux/major.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <scsi/scsi_ioctl.h>
 
 #include "scsi.h"

diff --git a/drivers/scsi/pcmcia/fdomain_stub.c b/drivers/scsi/pcmcia/fdomain_stub.c
index 4a42867..7e12c1d 100644 (file)
--- a/drivers/scsi/pcmcia/fdomain_stub.c
+++ b/drivers/scsi/pcmcia/fdomain_stub.c
@@ -41,7 +41,7 @@
 #include <linux/ioport.h>
 #include <scsi/scsi.h>
 #include <linux/major.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <scsi/scsi_ioctl.h>
 
 #include "scsi.h"

diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c
index ce52c02..59291c8 100644 (file)
--- a/drivers/scsi/pcmcia/nsp_cs.c
+++ b/drivers/scsi/pcmcia/nsp_cs.c
@@ -44,7 +44,7 @@
 #include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/major.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/stat.h>
 
 #include <asm/io.h>

diff --git a/drivers/scsi/pcmcia/qlogic_stub.c b/drivers/scsi/pcmcia/qlogic_stub.c
index e22d0d6..debc8c9 100644 (file)
--- a/drivers/scsi/pcmcia/qlogic_stub.c
+++ b/drivers/scsi/pcmcia/qlogic_stub.c
@@ -42,7 +42,7 @@
 #include <asm/io.h>
 #include <scsi/scsi.h>
 #include <linux/major.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <scsi/scsi_ioctl.h>
 
 #include "scsi.h"

diff --git a/drivers/scsi/pluto.c b/drivers/scsi/pluto.c
index e55f9d2..3da4531 100644 (file)
--- a/drivers/scsi/pluto.c
+++ b/drivers/scsi/pluto.c
@@ -9,7 +9,7 @@
 #include <linux/types.h>
 #include <linux/string.h>
 #include <linux/slab.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/proc_fs.h>
 #include <linux/stat.h>
 #include <linux/init.h>

diff --git a/drivers/scsi/ppa.c b/drivers/scsi/ppa.c
index a2f58b4..a30d9fb 100644 (file)
--- a/drivers/scsi/ppa.c
+++ b/drivers/scsi/ppa.c
@@ -15,7 +15,7 @@
 /* The following #define is to avoid a clash with hosts.c */
 #define PPA_CODE 1
 
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <asm/io.h>
 #include <linux/parport.h>
 #include <linux/workqueue.h>

diff --git a/drivers/scsi/ppa.h b/drivers/scsi/ppa.h
index 5077b14..c59f9a0 100644 (file)
--- a/drivers/scsi/ppa.h
+++ b/drivers/scsi/ppa.h
@@ -82,7 +82,7 @@
 #include  <linux/delay.h>
 #include  <linux/proc_fs.h>
 #include  <linux/stat.h>
-#include  <linux/blk.h>
+#include  <linux/blkdev.h>
 #include  <linux/sched.h>
 #include  <linux/interrupt.h>
 

diff --git a/drivers/scsi/psi240i.c b/drivers/scsi/psi240i.c
index 79c8478..6bb14ac 100644 (file)
--- a/drivers/scsi/psi240i.c
+++ b/drivers/scsi/psi240i.c
@@ -26,7 +26,7 @@
 
 #include <linux/module.h>
 
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/string.h>

diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c
index 8b5cdf8..a98ebec 100644 (file)
--- a/drivers/scsi/qla1280.c
+++ b/drivers/scsi/qla1280.c
@@ -252,7 +252,7 @@
 #include <linux/timer.h>
 #include <linux/pci.h>
 #include <linux/proc_fs.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/workqueue.h>
 #include <linux/stat.h>
 #include <linux/slab.h>

diff --git a/drivers/scsi/qlogicfas.c b/drivers/scsi/qlogicfas.c
index 1b37b71..05638f1 100644 (file)
--- a/drivers/scsi/qlogicfas.c
+++ b/drivers/scsi/qlogicfas.c
@@ -127,7 +127,7 @@
 #endif
 
 #include <linux/module.h>
-#include <linux/blk.h>         /* to get disk capacity */
+#include <linux/blkdev.h>              /* to get disk capacity */
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/init.h>

diff --git a/drivers/scsi/qlogicfc.c b/drivers/scsi/qlogicfc.c
index 003fa95..7765d8a 100644 (file)
--- a/drivers/scsi/qlogicfc.c
+++ b/drivers/scsi/qlogicfc.c
@@ -50,7 +50,7 @@
  *
  */
 
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/ioport.h>

diff --git a/drivers/scsi/qlogicisp.c b/drivers/scsi/qlogicisp.c
index 52ab098..20e9812 100644 (file)
--- a/drivers/scsi/qlogicisp.c
+++ b/drivers/scsi/qlogicisp.c
@@ -20,7 +20,7 @@
  * General Public License for more details.
  */
 
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/string.h>

diff --git a/drivers/scsi/qlogicpti.c b/drivers/scsi/qlogicpti.c
index 244f47a..3116a90 100644 (file)
--- a/drivers/scsi/qlogicpti.c
+++ b/drivers/scsi/qlogicpti.c
@@ -17,7 +17,7 @@
 #include <linux/types.h>
 #include <linux/string.h>
 #include <linux/slab.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/proc_fs.h>
 #include <linux/stat.h>
 #include <linux/init.h>

diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
index d0fbce2..138e78f 100644 (file)
--- a/drivers/scsi/scsi_debug.c
+++ b/drivers/scsi/scsi_debug.c
@@ -41,7 +41,7 @@
 #include <linux/vmalloc.h>
 #include <linux/moduleparam.h>
 
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include "scsi.h"
 #include "hosts.h"
 #include <scsi/scsicam.h>

diff --git a/drivers/scsi/scsi_ioctl.c b/drivers/scsi/scsi_ioctl.c
index 2864953..4723767 100644 (file)
--- a/drivers/scsi/scsi_ioctl.c
+++ b/drivers/scsi/scsi_ioctl.c
@@ -18,7 +18,7 @@
 #include <linux/mm.h>
 #include <linux/string.h>
 
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include "scsi.h"
 #include "hosts.h"
 #include <scsi/scsi_ioctl.h>

diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index e6d3cac..3997f09 100644 (file)
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -8,7 +8,7 @@
  */
 
 #include <linux/bio.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/completion.h>
 #include <linux/kernel.h>
 #include <linux/mempool.h>

diff --git a/drivers/scsi/scsi_pc98.c b/drivers/scsi/scsi_pc98.c
index afc8a24..13fdfa9 100644 (file)
--- a/drivers/scsi/scsi_pc98.c
+++ b/drivers/scsi/scsi_pc98.c
@@ -8,7 +8,7 @@
 #include <linux/fs.h>
 #include <linux/kernel.h>
 #include <linux/genhd.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <asm/pc9800.h>
 
 #include "scsi.h"

diff --git a/drivers/scsi/scsi_proc.c b/drivers/scsi/scsi_proc.c
index c07f536..7f67134 100644 (file)
--- a/drivers/scsi/scsi_proc.c
+++ b/drivers/scsi/scsi_proc.c
@@ -23,7 +23,7 @@
 #include <linux/slab.h>
 #include <linux/proc_fs.h>
 #include <linux/errno.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/seq_file.h>
 #include <asm/uaccess.h>
 

diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 6720dd2..9dffa0c 100644 (file)
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -29,7 +29,7 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/init.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 
 #include "scsi.h"
 #include "hosts.h"

diff --git a/drivers/scsi/scsi_syms.c b/drivers/scsi/scsi_syms.c
index a7fbd02..62e413e 100644 (file)
--- a/drivers/scsi/scsi_syms.c
+++ b/drivers/scsi/scsi_syms.c
@@ -11,7 +11,7 @@
 #include <linux/slab.h>
 #include <linux/ioport.h>
 #include <linux/kernel.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/fs.h>
 
 #include <asm/system.h>

diff --git a/drivers/scsi/scsicam.c b/drivers/scsi/scsicam.c
index 62eb5e5..d17702e 100644 (file)
--- a/drivers/scsi/scsicam.c
+++ b/drivers/scsi/scsicam.c
@@ -15,7 +15,7 @@
 #include <linux/fs.h>
 #include <linux/genhd.h>
 #include <linux/kernel.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/buffer_head.h>
 #include <asm/unaligned.h>
 #include "scsi.h"

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index f17aec4..dead50a 100644 (file)
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -43,7 +43,7 @@
 #include <linux/init.h>
 #include <linux/reboot.h>
 #include <linux/vmalloc.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/blkpg.h>
 #include <asm/uaccess.h>
 

diff --git a/drivers/scsi/seagate.c b/drivers/scsi/seagate.c
index 5033861..3a73cc7 100644 (file)
--- a/drivers/scsi/seagate.c
+++ b/drivers/scsi/seagate.c
@@ -95,7 +95,7 @@
 #include <linux/proc_fs.h>
 #include <linux/init.h>
 #include <linux/delay.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/stat.h>
 
 #include <asm/io.h>

diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index ad2ba8e..eef2346 100644 (file)
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -61,7 +61,7 @@ static int sg_version_num = 30529;    /* 2 digits for each component */
 #include <asm/uaccess.h>
 #include <asm/system.h>
 
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include "scsi.h"
 #include "hosts.h"
 #include <scsi/scsi_driver.h>

diff --git a/drivers/scsi/sgiwd93.c b/drivers/scsi/sgiwd93.c
index 6d02847..72a84ff 100644 (file)
--- a/drivers/scsi/sgiwd93.c
+++ b/drivers/scsi/sgiwd93.c
@@ -15,7 +15,7 @@
 #include <linux/init.h>
 #include <linux/types.h>
 #include <linux/mm.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/version.h>
 #include <linux/delay.h>
 #include <linux/spinlock.h>

diff --git a/drivers/scsi/sim710.c b/drivers/scsi/sim710.c
index 9eea121..d5b8cb3 100644 (file)
--- a/drivers/scsi/sim710.c
+++ b/drivers/scsi/sim710.c
@@ -29,7 +29,7 @@
 #include <linux/config.h>
 #include <linux/module.h>
 
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/device.h>
 #include <linux/init.h>
 #include <linux/mca.h>

diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index 8fa5176..e38e8d1 100644 (file)
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -43,7 +43,7 @@
 #include <linux/cdrom.h>
 #include <linux/interrupt.h>
 #include <linux/init.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <asm/uaccess.h>
 
 #include "scsi.h"

diff --git a/drivers/scsi/sr_ioctl.c b/drivers/scsi/sr_ioctl.c
index 0ac9325..7eb274c 100644 (file)
--- a/drivers/scsi/sr_ioctl.c
+++ b/drivers/scsi/sr_ioctl.c
@@ -4,7 +4,7 @@
 #include <linux/fs.h>
 #include <linux/errno.h>
 #include <linux/string.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/blkpg.h>
 #include <linux/cdrom.h>
 #include <asm/io.h>

diff --git a/drivers/scsi/sr_vendor.c b/drivers/scsi/sr_vendor.c
index 690d8fe..6fb9752 100644 (file)
--- a/drivers/scsi/sr_vendor.c
+++ b/drivers/scsi/sr_vendor.c
@@ -39,7 +39,7 @@
 #include <linux/string.h>
 #include <linux/bcd.h>
 
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include "scsi.h"
 #include "hosts.h"
 #include <scsi/scsi_ioctl.h>

diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
index 2885cb7..8d7339c 100644 (file)
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@ -32,7 +32,7 @@ static char *verstr = "20030622";
 #include <linux/ioctl.h>
 #include <linux/fcntl.h>
 #include <linux/spinlock.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/moduleparam.h>
 #include <linux/devfs_fs_kernel.h>
 #include <asm/uaccess.h>

diff --git a/drivers/scsi/sun3_scsi.c b/drivers/scsi/sun3_scsi.c
index f1fea9a..d6577f6 100644 (file)
--- a/drivers/scsi/sun3_scsi.c
+++ b/drivers/scsi/sun3_scsi.c
@@ -61,7 +61,7 @@
 #include <linux/sched.h>
 #include <linux/ioport.h>
 #include <linux/init.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 
 #include <asm/io.h>
 #include <asm/system.h>

diff --git a/drivers/scsi/sun3_scsi_vme.c b/drivers/scsi/sun3_scsi_vme.c
index 0fba9fe..10a1fd9 100644 (file)
--- a/drivers/scsi/sun3_scsi_vme.c
+++ b/drivers/scsi/sun3_scsi_vme.c
@@ -23,7 +23,7 @@
 #include <linux/sched.h>
 #include <linux/ioport.h>
 #include <linux/init.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 
 #include <asm/io.h>
 #include <asm/system.h>

diff --git a/drivers/scsi/sun3x_esp.c b/drivers/scsi/sun3x_esp.c
index b6320e6..1ce9095 100644 (file)
--- a/drivers/scsi/sun3x_esp.c
+++ b/drivers/scsi/sun3x_esp.c
@@ -9,7 +9,7 @@
 #include <linux/types.h>
 #include <linux/string.h>
 #include <linux/slab.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/proc_fs.h>
 #include <linux/stat.h>
 #include <linux/delay.h>

diff --git a/drivers/scsi/sym53c416.c b/drivers/scsi/sym53c416.c
index e7d971c..2a1d5a9 100644 (file)
--- a/drivers/scsi/sym53c416.c
+++ b/drivers/scsi/sym53c416.c
@@ -40,7 +40,7 @@
 #include <asm/dma.h>
 #include <asm/system.h>
 #include <asm/io.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/version.h>
 #include <linux/isapnp.h>
 #include "scsi.h"

diff --git a/drivers/scsi/sym53c8xx.c b/drivers/scsi/sym53c8xx.c
index eaf0d60..246e3ff 100644 (file)
--- a/drivers/scsi/sym53c8xx.c
+++ b/drivers/scsi/sym53c8xx.c
@@ -123,7 +123,7 @@
 #include <linux/timer.h>
 #include <linux/stat.h>
 
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,35)
 #include <linux/init.h>

diff --git a/drivers/scsi/sym53c8xx_2/sym_glue.h b/drivers/scsi/sym53c8xx_2/sym_glue.h
index d6339bc..10904a7 100644 (file)
--- a/drivers/scsi/sym53c8xx_2/sym_glue.h
+++ b/drivers/scsi/sym53c8xx_2/sym_glue.h
@@ -84,7 +84,7 @@
 #include <linux/stat.h>
 #include <linux/interrupt.h>
 
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 
 #ifdef __sparc__
 #  include <asm/irq.h>

diff --git a/drivers/scsi/t128.c b/drivers/scsi/t128.c
index ff5542e..addbdb5 100644 (file)
--- a/drivers/scsi/t128.c
+++ b/drivers/scsi/t128.c
@@ -110,7 +110,7 @@
 #include <linux/signal.h>
 #include <linux/sched.h>
 #include <asm/io.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/interrupt.h>
 #include <linux/stat.h>
 #include <linux/init.h>

diff --git a/drivers/scsi/tmscsim.c b/drivers/scsi/tmscsim.c
index 07f68ee..bc1860b 100644 (file)
--- a/drivers/scsi/tmscsim.c
+++ b/drivers/scsi/tmscsim.c
@@ -224,7 +224,7 @@
 #include <linux/mm.h>
 #include <linux/config.h>
 #include <linux/version.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/timer.h>
 
 #include "scsi.h"

diff --git a/drivers/scsi/u14-34f.c b/drivers/scsi/u14-34f.c
index 868e50a..9df2a4f 100644 (file)
--- a/drivers/scsi/u14-34f.c
+++ b/drivers/scsi/u14-34f.c
@@ -414,7 +414,7 @@
 #include <asm/system.h>
 #include <asm/byteorder.h>
 #include <linux/proc_fs.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/interrupt.h>
 #include <linux/stat.h>
 #include <linux/pci.h>

diff --git a/drivers/scsi/ultrastor.c b/drivers/scsi/ultrastor.c
index 5e18bef..abb52f8 100644 (file)
--- a/drivers/scsi/ultrastor.c
+++ b/drivers/scsi/ultrastor.c
@@ -128,7 +128,7 @@
  */
 
 #include <linux/module.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/interrupt.h>
 #include <linux/stddef.h>
 #include <linux/string.h>

diff --git a/drivers/scsi/wd33c93.c b/drivers/scsi/wd33c93.c
index 322fd0d..74353b8 100644 (file)
--- a/drivers/scsi/wd33c93.c
+++ b/drivers/scsi/wd33c93.c
@@ -79,7 +79,7 @@
 #include <linux/delay.h>
 #include <linux/version.h>
 #include <linux/init.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <asm/irq.h>
 
 #include "scsi.h"

diff --git a/drivers/scsi/wd7000.c b/drivers/scsi/wd7000.c
index 591d397..4dca4c1 100644 (file)
--- a/drivers/scsi/wd7000.c
+++ b/drivers/scsi/wd7000.c
@@ -174,7 +174,7 @@
 #include <linux/spinlock.h>
 #include <linux/ioport.h>
 #include <linux/proc_fs.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/init.h>
 #include <linux/stat.h>
 

diff --git a/drivers/scsi/zalon.c b/drivers/scsi/zalon.c
index 81aa555..bed64aa 100644 (file)
--- a/drivers/scsi/zalon.c
+++ b/drivers/scsi/zalon.c
@@ -7,7 +7,7 @@
 #include <linux/types.h>
 #include <linux/stat.h>
 #include <linux/mm.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/sched.h>
 #include <linux/version.h>
 #include <linux/config.h>

diff --git a/drivers/usb/image/hpusbscsi.c b/drivers/usb/image/hpusbscsi.c
index cb64dae..83f8137 100644 (file)
--- a/drivers/usb/image/hpusbscsi.c
+++ b/drivers/usb/image/hpusbscsi.c
@@ -9,7 +9,7 @@
 #include <linux/smp_lock.h>
 #include <linux/usb.h>
 #include <asm/atomic.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include "../../scsi/scsi.h"
 #include "../../scsi/hosts.h"
 

diff --git a/drivers/usb/image/microtek.c b/drivers/usb/image/microtek.c
index 6b0b070..dcef1e9 100644 (file)
--- a/drivers/usb/image/microtek.c
+++ b/drivers/usb/image/microtek.c
@@ -134,7 +134,7 @@
 #include <linux/proc_fs.h>
 
 #include <asm/atomic.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include "../../scsi/scsi.h"
 #include "../../scsi/hosts.h"
 

diff --git a/drivers/usb/storage/debug.h b/drivers/usb/storage/debug.h
index 9ca10f2..cde713a 100644 (file)
--- a/drivers/usb/storage/debug.h
+++ b/drivers/usb/storage/debug.h
@@ -46,7 +46,6 @@
 
 #include <linux/config.h>
 #include <linux/kernel.h>
-#include <linux/blk.h>
 #include <linux/cdrom.h>
 #include "usb.h"
 

diff --git a/drivers/usb/storage/protocol.h b/drivers/usb/storage/protocol.h
index 2868ae4..8b5ecbe 100644 (file)
--- a/drivers/usb/storage/protocol.h
+++ b/drivers/usb/storage/protocol.h
@@ -41,7 +41,7 @@
 #ifndef _PROTOCOL_H_
 #define _PROTOCOL_H_
 
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include "scsi.h"
 #include "usb.h"
 

diff --git a/drivers/usb/storage/scsiglue.h b/drivers/usb/storage/scsiglue.h
index 4d604c2..ed23135 100644 (file)
--- a/drivers/usb/storage/scsiglue.h
+++ b/drivers/usb/storage/scsiglue.h
@@ -41,7 +41,7 @@
 #ifndef _SCSIGLUE_H_
 #define _SCSIGLUE_H_
 
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include "scsi.h"
 #include "hosts.h"
 

diff --git a/drivers/usb/storage/transport.h b/drivers/usb/storage/transport.h
index 44ce6fd..123b041 100644 (file)
--- a/drivers/usb/storage/transport.h
+++ b/drivers/usb/storage/transport.h
@@ -42,7 +42,7 @@
 #define _TRANSPORT_H_
 
 #include <linux/config.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include "usb.h"
 #include "scsi.h"
 

diff --git a/drivers/usb/storage/usb.h b/drivers/usb/storage/usb.h
index 3c915f8..0d9f105 100644 (file)
--- a/drivers/usb/storage/usb.h
+++ b/drivers/usb/storage/usb.h
@@ -45,7 +45,7 @@
 #define _USB_H_
 
 #include <linux/usb.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/smp_lock.h>
 #include <linux/completion.h>
 #include <linux/version.h>

diff --git a/fs/bio.c b/fs/bio.c
index 6be1cb1..5aebadd 100644 (file)
--- a/fs/bio.c
+++ b/fs/bio.c
@@ -18,7 +18,7 @@
 #include <linux/mm.h>
 #include <linux/swap.h>
 #include <linux/bio.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/kernel.h>

diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
index 5ab872a..f5c44a1 100644 (file)
--- a/fs/compat_ioctl.c
+++ b/fs/compat_ioctl.c
@@ -52,7 +52,7 @@
 #include <linux/raw.h>
 #include <linux/smb_fs.h>
 #include <linux/blkpg.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/elevator.h>
 #include <linux/rtc.h>
 #include <linux/pci.h>

diff --git a/fs/intermezzo/sysctl.c b/fs/intermezzo/sysctl.c
index e6df855..023af7a 100644 (file)
--- a/fs/intermezzo/sysctl.c
+++ b/fs/intermezzo/sysctl.c
@@ -36,7 +36,6 @@
 #include <asm/segment.h>
 #include <asm/uaccess.h>
 #include <linux/utsname.h>
-#include <linux/blk.h>
 
 #include "intermezzo_fs.h"
 #include "intermezzo_psdev.h"

diff --git a/fs/intermezzo/vfs.c b/fs/intermezzo/vfs.c
index 1cfa4c9..385e1bd 100644 (file)
--- a/fs/intermezzo/vfs.c
+++ b/fs/intermezzo/vfs.c
@@ -66,7 +66,7 @@
 #include <linux/file.h>
 #include <linux/fs.h>
 #include <linux/namei.h>
-#include <linux/blk.h>
+#include <linux/genhd.h>
 
 #include "intermezzo_fs.h"
 #include "intermezzo_psdev.h"

diff --git a/fs/partitions/check.c b/fs/partitions/check.c
index fa9d8eb..8e27770 100644 (file)
--- a/fs/partitions/check.c
+++ b/fs/partitions/check.c
@@ -16,7 +16,6 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/fs.h>
-#include <linux/blk.h>
 #include <linux/kmod.h>
 #include <linux/ctype.h>
 #include <linux/devfs_fs_kernel.h>

diff --git a/fs/partitions/efi.h b/fs/partitions/efi.h
index 01bc2f8..bc1f5be 100644 (file)
--- a/fs/partitions/efi.h
+++ b/fs/partitions/efi.h
@@ -32,7 +32,6 @@
 #include <linux/kernel.h>
 #include <linux/major.h>
 #include <linux/string.h>
-#include <linux/blk.h>
 #include <linux/efi.h>
 
 #define MSDOS_MBR_SIGNATURE 0xaa55

diff --git a/fs/partitions/nec98.c b/fs/partitions/nec98.c
index cbd5578..5f78e5b 100644 (file)
--- a/fs/partitions/nec98.c
+++ b/fs/partitions/nec98.c
@@ -8,7 +8,6 @@
 #include <linux/fs.h>
 #include <linux/genhd.h>
 #include <linux/kernel.h>
-#include <linux/blk.h>
 #include <linux/hdreg.h>
 
 #include "check.h"

diff --git a/include/linux/blk.h b/include/linux/blk.h
index 69afaa4..42752bc 100644 (file)
--- a/include/linux/blk.h
+++ b/include/linux/blk.h
@@ -1,2 +1,2 @@
-/* this file is obsolete, please use <linux/blkdev.h> instead */
+#warning this file is obsolete, please use <linux/blkdev.h> instead
 #include <linux/blkdev.h>

diff --git a/include/linux/ide.h b/include/linux/ide.h
index 14cc454..dc52128 100644 (file)
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -1288,12 +1288,6 @@ extern ide_devices_t   *idescsi;
 #endif
 extern int noautodma;
 
-/*
- * We need blk.h, but we replace its end_request by our own version.
- */
-#define IDE_DRIVER             /* Toggle some magic bits in blk.h */
-#include <linux/blk.h>
-
 extern int ide_end_request (ide_drive_t *drive, int uptodate, int nrsecs);
 
 /*

diff --git a/include/linux/loop.h b/include/linux/loop.h
index ee3310e..daee2f9 100644 (file)
--- a/include/linux/loop.h
+++ b/include/linux/loop.h
@@ -15,7 +15,7 @@
 
 #ifdef __KERNEL__
 #include <linux/bio.h>
-#include <linux/blk.h>
+#include <linux/blkdev.h>
 #include <linux/spinlock.h>
 
 /* Possible states of device */

diff --git a/init/do_mounts.h b/init/do_mounts.h
index 297ab11..259de67 100644 (file)
--- a/init/do_mounts.h
+++ b/init/do_mounts.h
@@ -6,7 +6,7 @@
 #include <linux/unistd.h>
 #include <linux/slab.h>
 #include <linux/mount.h>
-#include <linux/blk.h>
+#include <linux/major.h>
 #include <linux/root_dev.h>
 
 asmlinkage long sys_unlink(const char *name);

diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
index 1bf482c..521e7f6 100644 (file)
--- a/init/do_mounts_initrd.c
+++ b/init/do_mounts_initrd.c
@@ -5,6 +5,7 @@
 #include <linux/ext2_fs.h>
 #include <linux/romfs_fs.h>
 #include <linux/initrd.h>
+#include <linux/sched.h>
 
 #include "do_mounts.h"
 

diff --git a/init/do_mounts_rd.c b/init/do_mounts_rd.c
index 9eb8eae..61d46ca 100644 (file)
--- a/init/do_mounts_rd.c
+++ b/init/do_mounts_rd.c
@@ -5,6 +5,7 @@
 #include <linux/ext2_fs.h>
 #include <linux/romfs_fs.h>
 #include <linux/initrd.h>
+#include <linux/string.h>
 
 #include "do_mounts.h"
 

diff --git a/init/main.c b/init/main.c
index e6af352..719e2dc 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -23,7 +23,6 @@
 #include <linux/ioport.h>
 #include <linux/init.h>
 #include <linux/smp_lock.h>
-#include <linux/blk.h>
 #include <linux/initrd.h>
 #include <linux/hdreg.h>
 #include <linux/bootmem.h>

diff --git a/kernel/suspend.c b/kernel/suspend.c
index 3087358..d68eae2 100644 (file)
--- a/kernel/suspend.c
+++ b/kernel/suspend.c
@@ -52,7 +52,6 @@
 #include <linux/genhd.h>
 #include <linux/kernel.h>
 #include <linux/major.h>
-#include <linux/blk.h>
 #include <linux/swap.h>
 #include <linux/pm.h>
 #include <linux/device.h>