[PATCH] #include <asm/bitops.h> -> #include <linux/bitops.h>

There's no reason to directly #include <asm/bitops.h> since it's
available on all architectures and also included by
#include <linux/bitops.h>.

This patch changes #include <asm/bitops.h> to #include <linux/bitops.h>.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/Documentation/DocBook/kernel-hacking.tmpl b/Documentation/DocBook/kernel-hacking.tmpl
index cd1bc1574613f38d6540d568960ba90fd3712b8e..1e8219d852555a5b8a1ff6219609efb928e64d0e 100644 (file)
--- a/Documentation/DocBook/kernel-hacking.tmpl
+++ b/Documentation/DocBook/kernel-hacking.tmpl
@@ -888,7 +888,7 @@ printk(KERN_INFO "my ip: %d.%d.%d.%d\n", NIPQUAD(ipaddress));
    The second class of atomic operations is atomic bit operations on a
    <type>long</type>, defined in
 
-   <filename class="headerfile">include/asm/bitops.h</filename>.  These
+   <filename class="headerfile">include/linux/bitops.h</filename>.  These
    operations generally take a pointer to the bit pattern, and a bit
    number: 0 is the least significant bit.
    <function>set_bit()</function>, <function>clear_bit()</function>

diff --git a/arch/alpha/kernel/irq.c b/arch/alpha/kernel/irq.c
index 199435fb9640a004c75ab94c148c8cdc39680ee1..b6114f5c0d2bc6d820cde8171f04d27ecde424e9 100644 (file)
--- a/arch/alpha/kernel/irq.c
+++ b/arch/alpha/kernel/irq.c
@@ -26,10 +26,10 @@
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <linux/profile.h>
+#include <linux/bitops.h>
 
 #include <asm/system.h>
 #include <asm/io.h>
-#include <asm/bitops.h>
 #include <asm/uaccess.h>
 
 /*

diff --git a/arch/alpha/kernel/signal.c b/arch/alpha/kernel/signal.c
index 94ff1b330ce4d8ab144dc3f79044d0e6da9a8b80..974329cf0e5b498e7ac1d6e5bd25a698dbc3b716 100644 (file)
--- a/arch/alpha/kernel/signal.c
+++ b/arch/alpha/kernel/signal.c
@@ -19,8 +19,8 @@
 #include <linux/stddef.h>
 #include <linux/tty.h>
 #include <linux/binfmts.h>
+#include <linux/bitops.h>
 
-#include <asm/bitops.h>
 #include <asm/uaccess.h>
 #include <asm/sigcontext.h>
 #include <asm/ucontext.h>

diff --git a/arch/alpha/kernel/smp.c b/arch/alpha/kernel/smp.c
index 6d4d09c43912611244b8d807c3253e3ae06f7f3d..04a4d366b2a628b6074b26fe2da7d5914d98ae77 100644 (file)
--- a/arch/alpha/kernel/smp.c
+++ b/arch/alpha/kernel/smp.c
@@ -26,6 +26,7 @@
 #include <linux/irq.h>
 #include <linux/cache.h>
 #include <linux/profile.h>
+#include <linux/bitops.h>
 
 #include <asm/hwrpb.h>
 #include <asm/ptrace.h>
@@ -33,7 +34,6 @@
 
 #include <asm/io.h>
 #include <asm/irq.h>
-#include <asm/bitops.h>
 #include <asm/pgtable.h>
 #include <asm/pgalloc.h>
 #include <asm/mmu_context.h>

diff --git a/arch/alpha/kernel/sys_alcor.c b/arch/alpha/kernel/sys_alcor.c
index 6852eeedf93bb133ce36d9a1fbee7ed4728b40c9..145dcde143aee7b71d2aae566751bc7c1fa7756e 100644 (file)
--- a/arch/alpha/kernel/sys_alcor.c
+++ b/arch/alpha/kernel/sys_alcor.c
@@ -16,12 +16,12 @@
 #include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/reboot.h>
+#include <linux/bitops.h>
 
 #include <asm/ptrace.h>
 #include <asm/system.h>
 #include <asm/io.h>
 #include <asm/dma.h>
-#include <asm/bitops.h>
 #include <asm/mmu_context.h>
 #include <asm/irq.h>
 #include <asm/pgtable.h>

diff --git a/arch/alpha/kernel/sys_cabriolet.c b/arch/alpha/kernel/sys_cabriolet.c
index c3f9dbc1ecc020be8b00cfe0b2369096f7a95ead..8e3374d34c95bf2782a34ae7ce2ca749c56b8590 100644 (file)
--- a/arch/alpha/kernel/sys_cabriolet.c
+++ b/arch/alpha/kernel/sys_cabriolet.c
@@ -16,12 +16,12 @@
 #include <linux/sched.h>
 #include <linux/pci.h>
 #include <linux/init.h>
+#include <linux/bitops.h>
 
 #include <asm/ptrace.h>
 #include <asm/system.h>
 #include <asm/dma.h>
 #include <asm/irq.h>
-#include <asm/bitops.h>
 #include <asm/mmu_context.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>

diff --git a/arch/alpha/kernel/sys_dp264.c b/arch/alpha/kernel/sys_dp264.c
index 10973586f592464c5b6df735a333690a23f0a9c8..6e334292bbcdfd717bd79521c8d01090906ba784 100644 (file)
--- a/arch/alpha/kernel/sys_dp264.c
+++ b/arch/alpha/kernel/sys_dp264.c
@@ -19,12 +19,12 @@
 #include <linux/sched.h>
 #include <linux/pci.h>
 #include <linux/init.h>
+#include <linux/bitops.h>
 
 #include <asm/ptrace.h>
 #include <asm/system.h>
 #include <asm/dma.h>
 #include <asm/irq.h>
-#include <asm/bitops.h>
 #include <asm/mmu_context.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>

diff --git a/arch/alpha/kernel/sys_eb64p.c b/arch/alpha/kernel/sys_eb64p.c
index 32d9c350b2c25af1fdbd8dc5986d6b023309ee31..61a79c354f0bdece82ed231db04aae15706fc226 100644 (file)
--- a/arch/alpha/kernel/sys_eb64p.c
+++ b/arch/alpha/kernel/sys_eb64p.c
@@ -15,12 +15,12 @@
 #include <linux/sched.h>
 #include <linux/pci.h>
 #include <linux/init.h>
+#include <linux/bitops.h>
 
 #include <asm/ptrace.h>
 #include <asm/system.h>
 #include <asm/dma.h>
 #include <asm/irq.h>
-#include <asm/bitops.h>
 #include <asm/mmu_context.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>

diff --git a/arch/alpha/kernel/sys_eiger.c b/arch/alpha/kernel/sys_eiger.c
index f98be3e85b6288c11b2f334e0514cf2b274598b9..bd6e5f0e43c7e443b1d23dd6935df6d26d2e2e61 100644 (file)
--- a/arch/alpha/kernel/sys_eiger.c
+++ b/arch/alpha/kernel/sys_eiger.c
@@ -15,12 +15,12 @@
 #include <linux/sched.h>
 #include <linux/pci.h>
 #include <linux/init.h>
+#include <linux/bitops.h>
 
 #include <asm/ptrace.h>
 #include <asm/system.h>
 #include <asm/dma.h>
 #include <asm/irq.h>
-#include <asm/bitops.h>
 #include <asm/mmu_context.h>
 #include <asm/io.h>
 #include <asm/pci.h>

diff --git a/arch/alpha/kernel/sys_marvel.c b/arch/alpha/kernel/sys_marvel.c
index 52873d5fc824dfaece7f8f00878efe30388cdb37..804727853d2576dcd05f35120fbe3db3573f2335 100644 (file)
--- a/arch/alpha/kernel/sys_marvel.c
+++ b/arch/alpha/kernel/sys_marvel.c
@@ -10,12 +10,12 @@
 #include <linux/sched.h>
 #include <linux/pci.h>
 #include <linux/init.h>
+#include <linux/bitops.h>
 
 #include <asm/ptrace.h>
 #include <asm/system.h>
 #include <asm/dma.h>
 #include <asm/irq.h>
-#include <asm/bitops.h>
 #include <asm/mmu_context.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>

diff --git a/arch/alpha/kernel/sys_mikasa.c b/arch/alpha/kernel/sys_mikasa.c
index a55c109f5c86a315cb3b715b5675f9c96f64cab0..d78a0daa6168e3c3216b82f2f8bc514bd94ded74 100644 (file)
--- a/arch/alpha/kernel/sys_mikasa.c
+++ b/arch/alpha/kernel/sys_mikasa.c
@@ -15,12 +15,12 @@
 #include <linux/sched.h>
 #include <linux/pci.h>
 #include <linux/init.h>
+#include <linux/bitops.h>
 
 #include <asm/ptrace.h>
 #include <asm/system.h>
 #include <asm/dma.h>
 #include <asm/irq.h>
-#include <asm/bitops.h>
 #include <asm/mmu_context.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>

diff --git a/arch/alpha/kernel/sys_nautilus.c b/arch/alpha/kernel/sys_nautilus.c
index dd3bdedb71f22184d5a14e7c05b1ee3553b1e7ba..c0d696efec5bafc2537e6b6dc2bb36c83058957c 100644 (file)
--- a/arch/alpha/kernel/sys_nautilus.c
+++ b/arch/alpha/kernel/sys_nautilus.c
@@ -32,12 +32,12 @@
 #include <linux/init.h>
 #include <linux/reboot.h>
 #include <linux/bootmem.h>
+#include <linux/bitops.h>
 
 #include <asm/ptrace.h>
 #include <asm/system.h>
 #include <asm/dma.h>
 #include <asm/irq.h>
-#include <asm/bitops.h>
 #include <asm/mmu_context.h>
 #include <asm/io.h>
 #include <asm/pci.h>

diff --git a/arch/alpha/kernel/sys_noritake.c b/arch/alpha/kernel/sys_noritake.c
index 02363fa7996206bd0ed3107719d50d5129a7c0e3..65061f5d741062e01ed1487a7bb389ec770245b2 100644 (file)
--- a/arch/alpha/kernel/sys_noritake.c
+++ b/arch/alpha/kernel/sys_noritake.c
@@ -16,12 +16,12 @@
 #include <linux/sched.h>
 #include <linux/pci.h>
 #include <linux/init.h>
+#include <linux/bitops.h>
 
 #include <asm/ptrace.h>
 #include <asm/system.h>
 #include <asm/dma.h>
 #include <asm/irq.h>
-#include <asm/bitops.h>
 #include <asm/mmu_context.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>

diff --git a/arch/alpha/kernel/sys_rx164.c b/arch/alpha/kernel/sys_rx164.c
index dfe16bc122ff33e98a10ed4490b199fb18e3a2b2..58404243057b65711300cf786175f62597122f04 100644 (file)
--- a/arch/alpha/kernel/sys_rx164.c
+++ b/arch/alpha/kernel/sys_rx164.c
@@ -14,12 +14,12 @@
 #include <linux/sched.h>
 #include <linux/pci.h>
 #include <linux/init.h>
+#include <linux/bitops.h>
 
 #include <asm/ptrace.h>
 #include <asm/system.h>
 #include <asm/dma.h>
 #include <asm/irq.h>
-#include <asm/bitops.h>
 #include <asm/mmu_context.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>

diff --git a/arch/alpha/kernel/sys_sx164.c b/arch/alpha/kernel/sys_sx164.c
index 3ee73b68efd4239ed34abf2f6bc37951cfbbdef5..94ad68b7c0ae70e3e6ab0ef80f062ca661498950 100644 (file)
--- a/arch/alpha/kernel/sys_sx164.c
+++ b/arch/alpha/kernel/sys_sx164.c
@@ -14,12 +14,12 @@
 #include <linux/sched.h>
 #include <linux/pci.h>
 #include <linux/init.h>
+#include <linux/bitops.h>
 
 #include <asm/ptrace.h>
 #include <asm/system.h>
 #include <asm/dma.h>
 #include <asm/irq.h>
-#include <asm/bitops.h>
 #include <asm/mmu_context.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>

diff --git a/arch/alpha/kernel/sys_titan.c b/arch/alpha/kernel/sys_titan.c
index 4466af674bc0075e50daf4a4038983c74afdb7e3..147058fae0c13a5eb7bf2301aac59f48ba919149 100644 (file)
--- a/arch/alpha/kernel/sys_titan.c
+++ b/arch/alpha/kernel/sys_titan.c
@@ -19,12 +19,12 @@
 #include <linux/sched.h>
 #include <linux/pci.h>
 #include <linux/init.h>
+#include <linux/bitops.h>
 
 #include <asm/ptrace.h>
 #include <asm/system.h>
 #include <asm/dma.h>
 #include <asm/irq.h>
-#include <asm/bitops.h>
 #include <asm/mmu_context.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>

diff --git a/arch/alpha/kernel/sys_wildfire.c b/arch/alpha/kernel/sys_wildfire.c
index 959e8d7dffc38ddc30623a90b3fead2a004e6a3d..57be096764a05c0a72102d41baa9196889f1a35b 100644 (file)
--- a/arch/alpha/kernel/sys_wildfire.c
+++ b/arch/alpha/kernel/sys_wildfire.c
@@ -12,12 +12,12 @@
 #include <linux/sched.h>
 #include <linux/pci.h>
 #include <linux/init.h>
+#include <linux/bitops.h>
 
 #include <asm/ptrace.h>
 #include <asm/system.h>
 #include <asm/dma.h>
 #include <asm/irq.h>
-#include <asm/bitops.h>
 #include <asm/mmu_context.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>

diff --git a/arch/arm/vfp/vfpdouble.c b/arch/arm/vfp/vfpdouble.c
index 54649c1ee43d7379a3d8f72dc0b925b115af9f30..3a4df3ffad3ebf9a2fda9c58f8b21b2a4a29d51f 100644 (file)
--- a/arch/arm/vfp/vfpdouble.c
+++ b/arch/arm/vfp/vfpdouble.c
@@ -31,7 +31,7 @@
  * ===========================================================================
  */
 #include <linux/kernel.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <asm/ptrace.h>
 #include <asm/vfp.h>
 

diff --git a/arch/arm/vfp/vfpsingle.c b/arch/arm/vfp/vfpsingle.c
index 92aa8412709e6662c0cf85ac98b5b21bfba675b7..265de1dee1e9e6f0336a2731ff857522cad96da4 100644 (file)
--- a/arch/arm/vfp/vfpsingle.c
+++ b/arch/arm/vfp/vfpsingle.c
@@ -31,7 +31,7 @@
  * ===========================================================================
  */
 #include <linux/kernel.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <asm/ptrace.h>
 #include <asm/vfp.h>
 

diff --git a/arch/arm26/machine/small_page.c b/arch/arm26/machine/small_page.c
index 3cbeffa017181fb5d4b991298400102548a71d72..78e9198c2e604ada89214419e312dbbd3fbe83f7 100644 (file)
--- a/arch/arm26/machine/small_page.c
+++ b/arch/arm26/machine/small_page.c
@@ -24,8 +24,8 @@
 #include <linux/mm.h>
 #include <linux/swap.h>
 #include <linux/smp.h>
+#include <linux/bitops.h>
 
-#include <asm/bitops.h>
 #include <asm/pgtable.h>
 
 #define PEDANTIC

diff --git a/arch/cris/arch-v10/drivers/ethernet.c b/arch/cris/arch-v10/drivers/ethernet.c
index 2b9d9b7163f5c62eaf96444780b9ac76d5d5dcbd..2e6a34135ece823050c08e44969c521a83e77cd9 100644 (file)
--- a/arch/cris/arch-v10/drivers/ethernet.c
+++ b/arch/cris/arch-v10/drivers/ethernet.c
@@ -222,13 +222,13 @@
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
 #include <linux/ethtool.h>
+#include <linux/bitops.h>
 
 #include <asm/arch/svinto.h>/* DMA and register descriptions */
 #include <asm/io.h>         /* LED_* I/O functions */
 #include <asm/irq.h>
 #include <asm/dma.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
 #include <asm/ethernet.h>
 #include <asm/cache.h>
 

diff --git a/arch/cris/arch-v10/drivers/serial.c b/arch/cris/arch-v10/drivers/serial.c
index 272795de9f5b6d67f835c37b06ddf8772d1aecda..5881533878d1e03076eeab22e6b8ec48010580cd 100644 (file)
--- a/arch/cris/arch-v10/drivers/serial.c
+++ b/arch/cris/arch-v10/drivers/serial.c
@@ -435,7 +435,7 @@ static char *serial_version = "$Revision: 1.20 $";
 #include <asm/irq.h>
 #include <asm/system.h>
 #include <asm/segment.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <linux/delay.h>
 
 #include <asm/arch/svinto.h>

diff --git a/arch/cris/kernel/irq.c b/arch/cris/kernel/irq.c
index bb8d2e4e7a9c9a625e9e766cd2b8e50792ace30c..2a9ed1806764d479a89720ae12636a4ef5d0c805 100644 (file)
--- a/arch/cris/kernel/irq.c
+++ b/arch/cris/kernel/irq.c
@@ -36,9 +36,9 @@
 #include <linux/init.h>
 #include <linux/seq_file.h>
 #include <linux/errno.h>
+#include <linux/bitops.h>
 
 #include <asm/io.h>
-#include <asm/bitops.h>
 
 /* Defined in arch specific irq.c */
 extern void arch_setup_irq(int irq);

diff --git a/arch/i386/kernel/i8259.c b/arch/i386/kernel/i8259.c
index dec7ebf49a48f61501b229651e4c71da80b377b2..686a95bd0bd77fcce75ee59079312c457af5a0b0 100644 (file)
--- a/arch/i386/kernel/i8259.c
+++ b/arch/i386/kernel/i8259.c
@@ -10,6 +10,7 @@
 #include <linux/init.h>
 #include <linux/kernel_stat.h>
 #include <linux/sysdev.h>
+#include <linux/bitops.h>
 
 #include <asm/8253pit.h>
 #include <asm/atomic.h>
@@ -17,7 +18,6 @@
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/timer.h>
-#include <asm/bitops.h>
 #include <asm/pgtable.h>
 #include <asm/delay.h>
 #include <asm/desc.h>

diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c
index e50c446e0f4f7766fcc0c5a3a43a99df7c329958..64295162dcb2af722eae48d9bdfc71ad7de239e7 100644 (file)
--- a/arch/ia64/hp/common/sba_iommu.c
+++ b/arch/ia64/hp/common/sba_iommu.c
@@ -33,13 +33,13 @@
 #include <linux/seq_file.h>
 #include <linux/acpi.h>
 #include <linux/efi.h>
+#include <linux/bitops.h>         /* hweight64() */
 
 #include <asm/delay.h>         /* ia64_get_itc() */
 #include <asm/io.h>
 #include <asm/page.h>          /* PAGE_OFFSET */
 #include <asm/dma.h>
 #include <asm/system.h>                /* wmb() */
-#include <asm/bitops.h>                /* hweight64() */
 
 #include <asm/acpi-ext.h>
 

diff --git a/arch/ia64/hp/sim/simeth.c b/arch/ia64/hp/sim/simeth.c
index 3c9c3072b68cde2457b7a737e03df75a9cb2742e..45d69f4d3c72d5affbe172b741dcd043d8d7a02e 100644 (file)
--- a/arch/ia64/hp/sim/simeth.c
+++ b/arch/ia64/hp/sim/simeth.c
@@ -20,7 +20,7 @@
 #include <linux/if_arp.h>
 #include <linux/skbuff.h>
 #include <linux/notifier.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <asm/system.h>
 #include <asm/irq.h>
 

diff --git a/arch/ia64/kernel/irq.c b/arch/ia64/kernel/irq.c
index f779d97a43a785641be54628ebdc3f05755a6697..b3afd073b9dcb66e3e5f6fd154ec6f80b340179a 100644 (file)
--- a/arch/ia64/kernel/irq.c
+++ b/arch/ia64/kernel/irq.c
@@ -43,13 +43,13 @@
 #include <linux/seq_file.h>
 #include <linux/kallsyms.h>
 #include <linux/notifier.h>
+#include <linux/bitops.h>
 
 #include <asm/atomic.h>
 #include <asm/cpu.h>
 #include <asm/io.h>
 #include <asm/smp.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
 #include <asm/uaccess.h>
 #include <asm/pgalloc.h>
 #include <asm/tlbflush.h>

diff --git a/arch/ia64/kernel/irq_ia64.c b/arch/ia64/kernel/irq_ia64.c
index 335d827ceb9f91fd5f0260a58571a7fa224f98da..946df2d55836ad9325ea758784034ecae5e1fcdc 100644 (file)
--- a/arch/ia64/kernel/irq_ia64.c
+++ b/arch/ia64/kernel/irq_ia64.c
@@ -30,8 +30,8 @@
 #include <linux/smp.h>
 #include <linux/smp_lock.h>
 #include <linux/threads.h>
+#include <linux/bitops.h>
 
-#include <asm/bitops.h>
 #include <asm/delay.h>
 #include <asm/intrinsics.h>
 #include <asm/io.h>

diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c
index 8561f8dcffba91feef1d67d725ef3cf2684f47b6..4c8043b74c8886d82124ed49f2a68ec4eeee6ca9 100644 (file)
--- a/arch/ia64/kernel/perfmon.c
+++ b/arch/ia64/kernel/perfmon.c
@@ -38,8 +38,8 @@
 #include <linux/pagemap.h>
 #include <linux/mount.h>
 #include <linux/version.h>
+#include <linux/bitops.h>
 
-#include <asm/bitops.h>
 #include <asm/errno.h>
 #include <asm/intrinsics.h>
 #include <asm/page.h>

diff --git a/arch/ia64/kernel/smp.c b/arch/ia64/kernel/smp.c
index 14134f2e3952ce56631850ae0670cad5f1aca62c..4041bb3bdfd218f2a1224c3e92f0706106fb96ac 100644 (file)
--- a/arch/ia64/kernel/smp.c
+++ b/arch/ia64/kernel/smp.c
@@ -29,9 +29,9 @@
 #include <linux/cache.h>
 #include <linux/delay.h>
 #include <linux/efi.h>
+#include <linux/bitops.h>
 
 #include <asm/atomic.h>
-#include <asm/bitops.h>
 #include <asm/current.h>
 #include <asm/delay.h>
 #include <asm/machvec.h>

diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c
index f0dd8c3dc67e15e210fddfc88e1e6d02b376c467..0a0bf975199c1ad29eb82bee4e323f47af6fad05 100644 (file)
--- a/arch/ia64/kernel/smpboot.c
+++ b/arch/ia64/kernel/smpboot.c
@@ -29,9 +29,9 @@
 #include <linux/spinlock.h>
 #include <linux/efi.h>
 #include <linux/percpu.h>
+#include <linux/bitops.h>
 
 #include <asm/atomic.h>
-#include <asm/bitops.h>
 #include <asm/cache.h>
 #include <asm/current.h>
 #include <asm/delay.h>

diff --git a/arch/ia64/lib/bitop.c b/arch/ia64/lib/bitop.c
index 1c6ee49fd3cf2458514e984d9504c55256db6484..d509e204c238e50b15b6cfee00d8870fcadb4bca 100644 (file)
--- a/arch/ia64/lib/bitop.c
+++ b/arch/ia64/lib/bitop.c
@@ -2,7 +2,7 @@
 #include <linux/types.h>
 #include <asm/intrinsics.h>
 #include <linux/module.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 
 /*
  * Find next zero bit in a bitmap reasonably efficiently..

diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
index 3bfbb7dc1f31b0286e6ff1c87c6ca668cec12f75..f7c6ddbf4ca3319e869eacf547d35fb3ebd95d7e 100644 (file)
--- a/arch/ia64/mm/init.c
+++ b/arch/ia64/mm/init.c
@@ -19,9 +19,9 @@
 #include <linux/slab.h>
 #include <linux/swap.h>
 #include <linux/proc_fs.h>
+#include <linux/bitops.h>
 
 #include <asm/a.out.h>
-#include <asm/bitops.h>
 #include <asm/dma.h>
 #include <asm/ia32.h>
 #include <asm/io.h>

diff --git a/arch/ia64/sn/kernel/sn2/sn2_smp.c b/arch/ia64/sn/kernel/sn2/sn2_smp.c
index 29a6915fadd1c4a1c61f8fe91b6344bf184d8694..5fa8f1f1a0661fdcd1e36f09c03f09359c12561f 100644 (file)
--- a/arch/ia64/sn/kernel/sn2/sn2_smp.c
+++ b/arch/ia64/sn/kernel/sn2/sn2_smp.c
@@ -18,6 +18,7 @@
 #include <linux/irq.h>
 #include <linux/mmzone.h>
 #include <linux/module.h>
+#include <linux/bitops.h>
 
 #include <asm/processor.h>
 #include <asm/irq.h>
@@ -28,7 +29,6 @@
 #include <asm/smp.h>
 #include <asm/tlb.h>
 #include <asm/numa.h>
-#include <asm/bitops.h>
 #include <asm/hw_irq.h>
 #include <asm/current.h>
 #include <asm/sn/sn_cpuid.h>

diff --git a/arch/m32r/kernel/irq.c b/arch/m32r/kernel/irq.c
index ba135773308a1c49351c2a1d71884c9d719c2d78..74ab2ec74e59ed144fd8c048828e2d83fac1cecc 100644 (file)
--- a/arch/m32r/kernel/irq.c
+++ b/arch/m32r/kernel/irq.c
@@ -42,12 +42,12 @@
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <linux/kallsyms.h>
+#include <linux/bitops.h>
 
 #include <asm/atomic.h>
 #include <asm/io.h>
 #include <asm/smp.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
 #include <asm/uaccess.h>
 #include <asm/delay.h>
 #include <asm/irq.h>

diff --git a/arch/m32r/mm/init.c b/arch/m32r/mm/init.c
index a290e3793caf1e6c88729f5903cc59535c95a231..b6a5aaceaadf3d826c490bd42c7969e6407ca36a 100644 (file)
--- a/arch/m32r/mm/init.c
+++ b/arch/m32r/mm/init.c
@@ -18,9 +18,9 @@
 #include <linux/bootmem.h>
 #include <linux/swap.h>
 #include <linux/highmem.h>
+#include <linux/bitops.h>
 #include <asm/types.h>
 #include <asm/processor.h>
-#include <asm/bitops.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
 #include <asm/pgalloc.h>

diff --git a/arch/m68k/sun3/mmu_emu.c b/arch/m68k/sun3/mmu_emu.c
index 0d9876190af09e5ca0e3344e1a279fa82dad17a3..5ced6d3c9926c922788ee5490290e2c7b08cea76 100644 (file)
--- a/arch/m68k/sun3/mmu_emu.c
+++ b/arch/m68k/sun3/mmu_emu.c
@@ -12,6 +12,7 @@
 #include <linux/ptrace.h>
 #include <linux/delay.h>
 #include <linux/bootmem.h>
+#include <linux/bitops.h>
 
 #include <asm/setup.h>
 #include <asm/traps.h>
@@ -21,7 +22,6 @@
 #include <asm/pgtable.h>
 #include <asm/sun3mmu.h>
 #include <asm/segment.h>
-#include <asm/bitops.h>
 #include <asm/oplib.h>
 #include <asm/mmu_context.h>
 #include <asm/dvma.h>

diff --git a/arch/mips/au1000/common/au1xxx_irqmap.c b/arch/mips/au1000/common/au1xxx_irqmap.c
index afac7edd2f586ab4aac26bb08982f54b7787303b..2043ec5205c7f9e2564ee25c2bf3b63785eb02b7 100644 (file)
--- a/arch/mips/au1000/common/au1xxx_irqmap.c
+++ b/arch/mips/au1000/common/au1xxx_irqmap.c
@@ -39,8 +39,8 @@
 #include <linux/slab.h>
 #include <linux/random.h>
 #include <linux/delay.h>
+#include <linux/bitops.h>
 
-#include <asm/bitops.h>
 #include <asm/bootinfo.h>
 #include <asm/io.h>
 #include <asm/mipsregs.h>

diff --git a/arch/mips/au1000/common/irq.c b/arch/mips/au1000/common/irq.c
index 5104328f7d7480da3ffb76610ad051440d23b834..989b7b5bb2b022e2dfe11a349751936a611dc456 100644 (file)
--- a/arch/mips/au1000/common/irq.c
+++ b/arch/mips/au1000/common/irq.c
@@ -41,8 +41,8 @@
 #include <linux/slab.h>
 #include <linux/random.h>
 #include <linux/delay.h>
+#include <linux/bitops.h>
 
-#include <asm/bitops.h>
 #include <asm/bootinfo.h>
 #include <asm/io.h>
 #include <asm/mipsregs.h>

diff --git a/arch/mips/au1000/csb250/irqmap.c b/arch/mips/au1000/csb250/irqmap.c
index d7fbda4921bb6458cbfada2a0c901d1bb84f2f83..5cb1166be35c8f2d0cb6691d0ff8794f001c7cb4 100644 (file)
--- a/arch/mips/au1000/csb250/irqmap.c
+++ b/arch/mips/au1000/csb250/irqmap.c
@@ -39,8 +39,8 @@
 #include <linux/slab.h>
 #include <linux/random.h>
 #include <linux/delay.h>
+#include <linux/bitops.h>
 
-#include <asm/bitops.h>
 #include <asm/bootinfo.h>
 #include <asm/io.h>
 #include <asm/mipsregs.h>

diff --git a/arch/mips/au1000/db1x00/irqmap.c b/arch/mips/au1000/db1x00/irqmap.c
index cbae591f022a5c5b94a2e844cc6aaf49ea2dc503..8f6ef0dbe1f854f3227f261be563a208a7534db4 100644 (file)
--- a/arch/mips/au1000/db1x00/irqmap.c
+++ b/arch/mips/au1000/db1x00/irqmap.c
@@ -40,8 +40,8 @@
 #include <linux/slab.h>
 #include <linux/random.h>
 #include <linux/delay.h>
+#include <linux/bitops.h>
 
-#include <asm/bitops.h>
 #include <asm/bootinfo.h>
 #include <asm/io.h>
 #include <asm/mipsregs.h>

diff --git a/arch/mips/au1000/hydrogen3/irqmap.c b/arch/mips/au1000/hydrogen3/irqmap.c
index a335c90bdec5688b127c9c7486b692f4751376f8..6eacaa0daa4918b55d563a819ceaf35681259d42 100644 (file)
--- a/arch/mips/au1000/hydrogen3/irqmap.c
+++ b/arch/mips/au1000/hydrogen3/irqmap.c
@@ -39,8 +39,8 @@
 #include <linux/slab.h>
 #include <linux/random.h>
 #include <linux/delay.h>
+#include <linux/bitops.h>
 
-#include <asm/bitops.h>
 #include <asm/bootinfo.h>
 #include <asm/io.h>
 #include <asm/mipsregs.h>

diff --git a/arch/mips/au1000/mtx-1/irqmap.c b/arch/mips/au1000/mtx-1/irqmap.c
index 720bc759d62de8a835820421e8ad4c264b506189..51fcc2cbe0af1df57dae672916b5cae13a0ca526 100644 (file)
--- a/arch/mips/au1000/mtx-1/irqmap.c
+++ b/arch/mips/au1000/mtx-1/irqmap.c
@@ -39,8 +39,8 @@
 #include <linux/slab.h>
 #include <linux/random.h>
 #include <linux/delay.h>
+#include <linux/bitops.h>
 
-#include <asm/bitops.h>
 #include <asm/bootinfo.h>
 #include <asm/io.h>
 #include <asm/mipsregs.h>

diff --git a/arch/mips/au1000/pb1000/irqmap.c b/arch/mips/au1000/pb1000/irqmap.c
index 215b07a6d0d96de18ace3f2ee52657fb560eea42..4950c33a4bdceb546dd7140905571aa664a8668c 100644 (file)
--- a/arch/mips/au1000/pb1000/irqmap.c
+++ b/arch/mips/au1000/pb1000/irqmap.c
@@ -39,8 +39,8 @@
 #include <linux/slab.h>
 #include <linux/random.h>
 #include <linux/delay.h>
+#include <linux/bitops.h>
 
-#include <asm/bitops.h>
 #include <asm/bootinfo.h>
 #include <asm/io.h>
 #include <asm/mipsregs.h>

diff --git a/arch/mips/au1000/pb1100/irqmap.c b/arch/mips/au1000/pb1100/irqmap.c
index 6333deb601e1d3ed58efaa344ddaf7fa17928e0e..bfb389e7e17cbf4277f045afdf5356db3e2d154d 100644 (file)
--- a/arch/mips/au1000/pb1100/irqmap.c
+++ b/arch/mips/au1000/pb1100/irqmap.c
@@ -39,8 +39,8 @@
 #include <linux/slab.h>
 #include <linux/random.h>
 #include <linux/delay.h>
+#include <linux/bitops.h>
 
-#include <asm/bitops.h>
 #include <asm/bootinfo.h>
 #include <asm/io.h>
 #include <asm/mipsregs.h>

diff --git a/arch/mips/au1000/pb1500/irqmap.c b/arch/mips/au1000/pb1500/irqmap.c
index 79c4e0fd6ef553b161939224f139fcf3da4b6b44..476e2500168176ee57c93598f33714096cfd52cc 100644 (file)
--- a/arch/mips/au1000/pb1500/irqmap.c
+++ b/arch/mips/au1000/pb1500/irqmap.c
@@ -39,8 +39,8 @@
 #include <linux/slab.h>
 #include <linux/random.h>
 #include <linux/delay.h>
+#include <linux/bitops.h>
 
-#include <asm/bitops.h>
 #include <asm/bootinfo.h>
 #include <asm/io.h>
 #include <asm/mipsregs.h>

diff --git a/arch/mips/au1000/pb1550/irqmap.c b/arch/mips/au1000/pb1550/irqmap.c
index 4f692163b9c99561d5b80e9a049f4c9d4e10e532..889d4949ee76639aeded44b9bb4900527fe4c445 100644 (file)
--- a/arch/mips/au1000/pb1550/irqmap.c
+++ b/arch/mips/au1000/pb1550/irqmap.c
@@ -39,8 +39,8 @@
 #include <linux/slab.h>
 #include <linux/random.h>
 #include <linux/delay.h>
+#include <linux/bitops.h>
 
-#include <asm/bitops.h>
 #include <asm/bootinfo.h>
 #include <asm/io.h>
 #include <asm/mipsregs.h>

diff --git a/arch/mips/au1000/xxs1500/irqmap.c b/arch/mips/au1000/xxs1500/irqmap.c
index d751f48a69d95da43e9a1c3c4dfd1bb7d9e0e073..954800a0ab527401aa014eb3c8fdbb5442410622 100644 (file)
--- a/arch/mips/au1000/xxs1500/irqmap.c
+++ b/arch/mips/au1000/xxs1500/irqmap.c
@@ -39,8 +39,8 @@
 #include <linux/slab.h>
 #include <linux/random.h>
 #include <linux/delay.h>
+#include <linux/bitops.h>
 
-#include <asm/bitops.h>
 #include <asm/bootinfo.h>
 #include <asm/io.h>
 #include <asm/mipsregs.h>

diff --git a/arch/mips/baget/irq.c b/arch/mips/baget/irq.c
index 3dcc16efd08a7aa704e7d176eb1c0f3e69c66a75..341562d6eca004f58fa5c93acc41ca6cc8f5559a 100644 (file)
--- a/arch/mips/baget/irq.c
+++ b/arch/mips/baget/irq.c
@@ -18,8 +18,8 @@
 #include <linux/slab.h>
 #include <linux/random.h>
 #include <linux/delay.h>
+#include <linux/bitops.h>
 
-#include <asm/bitops.h>
 #include <asm/bootinfo.h>
 #include <asm/io.h>
 #include <asm/irq.h>

diff --git a/arch/mips/gt64120/ev64120/irq.c b/arch/mips/gt64120/ev64120/irq.c
index 537eab3fd314689289c7894a78e5cb6a76a1a03f..656aaeb8bf2a3a4eda81853f32225acdbe35564f 100644 (file)
--- a/arch/mips/gt64120/ev64120/irq.c
+++ b/arch/mips/gt64120/ev64120/irq.c
@@ -39,7 +39,7 @@
 #include <linux/timex.h>
 #include <linux/slab.h>
 #include <linux/random.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <asm/bootinfo.h>
 #include <asm/io.h>
 #include <asm/mipsregs.h>

diff --git a/arch/mips/gt64120/momenco_ocelot/irq.c b/arch/mips/gt64120/momenco_ocelot/irq.c
index 6812277807bfea41660dbe129e4bccf928c3a769..d04c62b073d999c4d02d3bb861e1303de8fc08eb 100644 (file)
--- a/arch/mips/gt64120/momenco_ocelot/irq.c
+++ b/arch/mips/gt64120/momenco_ocelot/irq.c
@@ -41,7 +41,7 @@
 #include <linux/timex.h>
 #include <linux/slab.h>
 #include <linux/random.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <asm/bootinfo.h>
 #include <asm/io.h>
 #include <asm/irq.h>

diff --git a/arch/mips/ite-boards/generic/irq.c b/arch/mips/ite-boards/generic/irq.c
index 4be10d820687dbfec0c84b245ca2736187bf507a..941590ec70ce00beb541a1d72e07c409d0394d5f 100644 (file)
--- a/arch/mips/ite-boards/generic/irq.c
+++ b/arch/mips/ite-boards/generic/irq.c
@@ -47,8 +47,8 @@
 #include <linux/slab.h>
 #include <linux/random.h>
 #include <linux/serial_reg.h>
+#include <linux/bitops.h>
 
-#include <asm/bitops.h>
 #include <asm/bootinfo.h>
 #include <asm/io.h>
 #include <asm/mipsregs.h>

diff --git a/arch/mips/jmr3927/rbhma3100/irq.c b/arch/mips/jmr3927/rbhma3100/irq.c
index 4ab85b5b2b4d2e1e9f3318e59d1d05b96afeecbd..abb2ba63267011cb3a8053d32e93c99fb23ad2d1 100644 (file)
--- a/arch/mips/jmr3927/rbhma3100/irq.c
+++ b/arch/mips/jmr3927/rbhma3100/irq.c
@@ -45,8 +45,8 @@
 #include <linux/random.h>
 #include <linux/smp.h>
 #include <linux/smp_lock.h>
+#include <linux/bitops.h>
 
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/mipsregs.h>
 #include <asm/system.h>

diff --git a/arch/mips/kernel/signal.c b/arch/mips/kernel/signal.c
index 325705fcc5c12aa05b9e4f1602de8f6fd7485634..025faa57be56f62e2d3daefea764c57266c4e172 100644 (file)
--- a/arch/mips/kernel/signal.c
+++ b/arch/mips/kernel/signal.c
@@ -20,9 +20,9 @@
 #include <linux/ptrace.h>
 #include <linux/suspend.h>
 #include <linux/unistd.h>
+#include <linux/bitops.h>
 
 #include <asm/asm.h>
-#include <asm/bitops.h>
 #include <asm/cacheflush.h>
 #include <asm/fpu.h>
 #include <asm/sim.h>

diff --git a/arch/mips/kernel/signal32.c b/arch/mips/kernel/signal32.c
index a449a5651c42ea2abc19041e1587fe5de65af877..e12e1dbd15fe76cb3d7ada7b96f3d535730ba815 100644 (file)
--- a/arch/mips/kernel/signal32.c
+++ b/arch/mips/kernel/signal32.c
@@ -19,9 +19,9 @@
 #include <linux/ptrace.h>
 #include <linux/compat.h>
 #include <linux/suspend.h>
+#include <linux/bitops.h>
 
 #include <asm/asm.h>
-#include <asm/bitops.h>
 #include <asm/cacheflush.h>
 #include <asm/sim.h>
 #include <asm/uaccess.h>

diff --git a/arch/mips/kernel/signal_n32.c b/arch/mips/kernel/signal_n32.c
index d2f8b8cf67e093516e0e805b8f3ef4445b82b63c..4a61749221f083b09e3d55409529f59cd1b105e7 100644 (file)
--- a/arch/mips/kernel/signal_n32.c
+++ b/arch/mips/kernel/signal_n32.c
@@ -26,9 +26,9 @@
 #include <linux/ptrace.h>
 #include <linux/unistd.h>
 #include <linux/compat.h>
+#include <linux/bitops.h>
 
 #include <asm/asm.h>
-#include <asm/bitops.h>
 #include <asm/cacheflush.h>
 #include <asm/sim.h>
 #include <asm/uaccess.h>

diff --git a/arch/mips/momentum/ocelot_c/irq.c b/arch/mips/momentum/ocelot_c/irq.c
index 13dd8bd7404198571f3ab990bb7887e1c0c13d8c..dd10713e174bbfccc333cd02d1a85d3f5f31abaa 100644 (file)
--- a/arch/mips/momentum/ocelot_c/irq.c
+++ b/arch/mips/momentum/ocelot_c/irq.c
@@ -41,7 +41,7 @@
 #include <linux/timex.h>
 #include <linux/slab.h>
 #include <linux/random.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <asm/bootinfo.h>
 #include <asm/io.h>
 #include <asm/irq_cpu.h>

diff --git a/arch/mips/momentum/ocelot_g/irq.c b/arch/mips/momentum/ocelot_g/irq.c
index 7d838c132c89ce79034f677efbda487ba4038371..c5adfa6d82316089aa7d18ff05c0b57e9eb3af0a 100644 (file)
--- a/arch/mips/momentum/ocelot_g/irq.c
+++ b/arch/mips/momentum/ocelot_g/irq.c
@@ -41,7 +41,7 @@
 #include <linux/timex.h>
 #include <linux/slab.h>
 #include <linux/random.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <asm/bootinfo.h>
 #include <asm/io.h>
 #include <asm/irq.h>

diff --git a/arch/mips/pmc-sierra/yosemite/irq.c b/arch/mips/pmc-sierra/yosemite/irq.c
index e8b7ed63eaa0e0dedef41ac160760083e41844da..df38a4209d0479fc325a7feb045a56110b043cb7 100644 (file)
--- a/arch/mips/pmc-sierra/yosemite/irq.c
+++ b/arch/mips/pmc-sierra/yosemite/irq.c
@@ -37,7 +37,7 @@
 #include <linux/timex.h>
 #include <linux/slab.h>
 #include <linux/random.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <asm/bootinfo.h>
 #include <asm/io.h>
 #include <asm/irq.h>

diff --git a/arch/mips/sgi-ip27/ip27-irq.c b/arch/mips/sgi-ip27/ip27-irq.c
index 917c1ee7aef2aa965e38bab7e3ff174d4ef80db3..6678b903c0742a02170b3c93d3d20c63d2be0548 100644 (file)
--- a/arch/mips/sgi-ip27/ip27-irq.c
+++ b/arch/mips/sgi-ip27/ip27-irq.c
@@ -20,8 +20,8 @@
 #include <linux/smp_lock.h>
 #include <linux/kernel_stat.h>
 #include <linux/delay.h>
+#include <linux/bitops.h>
 
-#include <asm/bitops.h>
 #include <asm/bootinfo.h>
 #include <asm/io.h>
 #include <asm/mipsregs.h>

diff --git a/arch/mips/sgi-ip32/ip32-irq.c b/arch/mips/sgi-ip32/ip32-irq.c
index 75846d6e81548414217b9fb756e996581766363e..3d7b04c66aded9a86dab8b8a9ce7c4a13adf8acd 100644 (file)
--- a/arch/mips/sgi-ip32/ip32-irq.c
+++ b/arch/mips/sgi-ip32/ip32-irq.c
@@ -20,7 +20,6 @@
 #include <linux/random.h>
 #include <linux/sched.h>
 
-#include <asm/bitops.h>
 #include <asm/mipsregs.h>
 #include <asm/signal.h>
 #include <asm/system.h>

diff --git a/arch/mips/tx4927/common/tx4927_irq.c b/arch/mips/tx4927/common/tx4927_irq.c
index bf59409eea36c0a68e5dcacb0264f3597cf35462..c89dd5f94d93f0ba3ba722473633434f7769b172 100644 (file)
--- a/arch/mips/tx4927/common/tx4927_irq.c
+++ b/arch/mips/tx4927/common/tx4927_irq.c
@@ -37,7 +37,7 @@
 #include <linux/slab.h>
 #include <linux/random.h>
 #include <linux/irq.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <asm/bootinfo.h>
 #include <asm/io.h>
 #include <asm/irq.h>

diff --git a/arch/mips/tx4927/common/tx4927_setup.c b/arch/mips/tx4927/common/tx4927_setup.c
index 73d188ff6a46e48846819d7f72141f9ab4cd4998..88d02973d132c38afce110fed1f48781f6379789 100644 (file)
--- a/arch/mips/tx4927/common/tx4927_setup.c
+++ b/arch/mips/tx4927/common/tx4927_setup.c
@@ -38,7 +38,7 @@
 #include <linux/slab.h>
 #include <linux/random.h>
 #include <linux/irq.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <asm/bootinfo.h>
 #include <asm/io.h>
 #include <asm/irq.h>

diff --git a/arch/parisc/kernel/smp.c b/arch/parisc/kernel/smp.c
index 9def95a4313b4b2f59d8226377636ab3e92ca3c9..ddc53e1bf0444613ad1e164488401161428d5151 100644 (file)
--- a/arch/parisc/kernel/smp.c
+++ b/arch/parisc/kernel/smp.c
@@ -33,10 +33,10 @@
 #include <linux/kernel_stat.h>
 #include <linux/mm.h>
 #include <linux/delay.h>
+#include <linux/bitops.h>
 
 #include <asm/system.h>
 #include <asm/atomic.h>
-#include <asm/bitops.h>
 #include <asm/current.h>
 #include <asm/delay.h>
 #include <asm/pgalloc.h>       /* for flush_tlb_all() proto/macro */

diff --git a/arch/ppc/4xx_io/serial_sicc.c b/arch/ppc/4xx_io/serial_sicc.c
index f0728f3c0e7b8be55f38971b8913cf1f7c096919..0e7ba9ecba2696e712b583d9bbdee3da0f7591c4 100644 (file)
--- a/arch/ppc/4xx_io/serial_sicc.c
+++ b/arch/ppc/4xx_io/serial_sicc.c
@@ -51,12 +51,12 @@
 #include <linux/serial.h>
 #include <linux/console.h>
 #include <linux/sysrq.h>
+#include <linux/bitops.h>
 
 #include <asm/system.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/uaccess.h>
-#include <asm/bitops.h>
 #include <asm/serial.h>
 
 

diff --git a/arch/ppc/8260_io/enet.c b/arch/ppc/8260_io/enet.c
index 3f8aa419771e1374611723aede0eaecda2c800bd..ac6d55fe22359c3ab2cd7854d95d227f8d49117f 100644 (file)
--- a/arch/ppc/8260_io/enet.c
+++ b/arch/ppc/8260_io/enet.c
@@ -39,11 +39,11 @@
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
 #include <linux/spinlock.h>
+#include <linux/bitops.h>
 
 #include <asm/immap_cpm2.h>
 #include <asm/pgtable.h>
 #include <asm/mpc8260.h>
-#include <asm/bitops.h>
 #include <asm/uaccess.h>
 #include <asm/cpm2.h>
 #include <asm/irq.h>

diff --git a/arch/ppc/8260_io/fcc_enet.c b/arch/ppc/8260_io/fcc_enet.c
index 41ca12432d8e157d266a5b5573e55db87e9db751..a38487b11503805ea8389f5e094603045bc03361 100644 (file)
--- a/arch/ppc/8260_io/fcc_enet.c
+++ b/arch/ppc/8260_io/fcc_enet.c
@@ -34,12 +34,12 @@
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
 #include <linux/spinlock.h>
+#include <linux/bitops.h>
 
 #include <asm/immap_cpm2.h>
 #include <asm/pgtable.h>
 #include <asm/mpc8260.h>
 #include <asm/irq.h>
-#include <asm/bitops.h>
 #include <asm/uaccess.h>
 #include <asm/cpm2.h>
 

diff --git a/arch/ppc/8xx_io/enet.c b/arch/ppc/8xx_io/enet.c
index 8ddef1c5cf11dd34bdc3fdce793ed9a7e0bedc34..3508f31b6d3bdfb9615c142288a27a30ef7d7995 100644 (file)
--- a/arch/ppc/8xx_io/enet.c
+++ b/arch/ppc/8xx_io/enet.c
@@ -38,11 +38,11 @@
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
 #include <linux/spinlock.h>
+#include <linux/bitops.h>
 
 #include <asm/8xx_immap.h>
 #include <asm/pgtable.h>
 #include <asm/mpc8xx.h>
-#include <asm/bitops.h>
 #include <asm/uaccess.h>
 #include <asm/commproc.h>
 

diff --git a/arch/ppc/8xx_io/fec.c b/arch/ppc/8xx_io/fec.c
index 5c7c914f84ea5736704ca457eeb9d8f7a6ed3d57..30ea33a5fbb4e9e23e0a6594c90e3c0ead2ff551 100644 (file)
--- a/arch/ppc/8xx_io/fec.c
+++ b/arch/ppc/8xx_io/fec.c
@@ -44,6 +44,7 @@
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
 #include <linux/spinlock.h>
+#include <linux/bitops.h>
 #ifdef CONFIG_FEC_PACKETHOOK
 #include <linux/pkthook.h>
 #endif
@@ -52,7 +53,6 @@
 #include <asm/pgtable.h>
 #include <asm/mpc8xx.h>
 #include <asm/irq.h>
-#include <asm/bitops.h>
 #include <asm/uaccess.h>
 #include <asm/commproc.h>
 

diff --git a/arch/ppc/kernel/bitops.c b/arch/ppc/kernel/bitops.c
index c00bad67db410741336a7ea50a217d13b35d231b..7f53d193968b423b239586ccd502841d624aac84 100644 (file)
--- a/arch/ppc/kernel/bitops.c
+++ b/arch/ppc/kernel/bitops.c
@@ -3,7 +3,7 @@
  */
 
 #include <linux/kernel.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 
 /*
  * If the bitops are not inlined in bitops.h, they are defined here.

diff --git a/arch/ppc/kernel/irq.c b/arch/ppc/kernel/irq.c
index 168dcd7185464261e84b66e64da3d6ccf31ff9c5..7b842826c88a623a3b406405580f94e568bcc80f 100644 (file)
--- a/arch/ppc/kernel/irq.c
+++ b/arch/ppc/kernel/irq.c
@@ -47,9 +47,9 @@
 #include <linux/seq_file.h>
 #include <linux/cpumask.h>
 #include <linux/profile.h>
+#include <linux/bitops.h>
 
 #include <asm/uaccess.h>
-#include <asm/bitops.h>
 #include <asm/system.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>

diff --git a/arch/ppc/kernel/ppc_htab.c b/arch/ppc/kernel/ppc_htab.c
index d8e027fd4849489af52bf84ab767095edc87271c..b5cd7e411e65c09d0b17403982ef132e90a06c29 100644 (file)
--- a/arch/ppc/kernel/ppc_htab.c
+++ b/arch/ppc/kernel/ppc_htab.c
@@ -21,9 +21,9 @@
 #include <linux/smp_lock.h>
 #include <linux/seq_file.h>
 #include <linux/init.h>
+#include <linux/bitops.h>
 
 #include <asm/uaccess.h>
-#include <asm/bitops.h>
 #include <asm/mmu.h>
 #include <asm/residual.h>
 #include <asm/io.h>

diff --git a/arch/ppc/kernel/ppc_ksyms.c b/arch/ppc/kernel/ppc_ksyms.c
index 44114bac11d0ba820dea0e936eba8cd793d91dcf..85b47a7f4a153b744daff1c2bc33684c781beae0 100644 (file)
--- a/arch/ppc/kernel/ppc_ksyms.c
+++ b/arch/ppc/kernel/ppc_ksyms.c
@@ -15,6 +15,7 @@
 #include <linux/delay.h>
 #include <linux/ide.h>
 #include <linux/pm.h>
+#include <linux/bitops.h>
 
 #include <asm/page.h>
 #include <asm/semaphore.h>
@@ -23,7 +24,6 @@
 #include <asm/io.h>
 #include <asm/ide.h>
 #include <asm/atomic.h>
-#include <asm/bitops.h>
 #include <asm/checksum.h>
 #include <asm/pgtable.h>
 #include <asm/tlbflush.h>

diff --git a/arch/ppc/platforms/pmac_setup.c b/arch/ppc/platforms/pmac_setup.c
index 79fc295143ebd46d481c0bd5ee48722c22b49cd2..5139523319862d5a1dd2de1151ab96823f2a28f5 100644 (file)
--- a/arch/ppc/platforms/pmac_setup.c
+++ b/arch/ppc/platforms/pmac_setup.c
@@ -51,13 +51,13 @@
 #include <linux/irq.h>
 #include <linux/seq_file.h>
 #include <linux/root_dev.h>
+#include <linux/bitops.h>
 
 #include <asm/reg.h>
 #include <asm/sections.h>
 #include <asm/prom.h>
 #include <asm/system.h>
 #include <asm/pgtable.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/pci-bridge.h>
 #include <asm/ohare.h>

diff --git a/arch/ppc/syslib/prom.c b/arch/ppc/syslib/prom.c
index 1ddb0c0eb8bb090af64cbc09d11e6a6edd2f0bc4..1b23f1e23ae3a0511d86eb207177fb690ec9a528 100644 (file)
--- a/arch/ppc/syslib/prom.c
+++ b/arch/ppc/syslib/prom.c
@@ -19,6 +19,7 @@
 #include <linux/ioport.h>
 #include <linux/pci.h>
 #include <linux/slab.h>
+#include <linux/bitops.h>
 
 #include <asm/sections.h>
 #include <asm/prom.h>
@@ -31,7 +32,6 @@
 #include <asm/system.h>
 #include <asm/mmu.h>
 #include <asm/pgtable.h>
-#include <asm/bitops.h>
 #include <asm/bootinfo.h>
 #include <asm/btext.h>
 #include <asm/pci-bridge.h>

diff --git a/arch/ppc/syslib/prom_init.c b/arch/ppc/syslib/prom_init.c
index ac4c8b158041cfeac7729ac250cb56f58098b250..3d6ea5ee8f6f5af20578c20f961df75f99305171 100644 (file)
--- a/arch/ppc/syslib/prom_init.c
+++ b/arch/ppc/syslib/prom_init.c
@@ -15,6 +15,7 @@
 #include <linux/ioport.h>
 #include <linux/pci.h>
 #include <linux/slab.h>
+#include <linux/bitops.h>
 
 #include <asm/sections.h>
 #include <asm/prom.h>
@@ -26,7 +27,6 @@
 #include <asm/system.h>
 #include <asm/mmu.h>
 #include <asm/pgtable.h>
-#include <asm/bitops.h>
 #include <asm/bootinfo.h>
 #include <asm/btext.h>
 #include <asm/pci-bridge.h>

diff --git a/arch/ppc/xmon/start.c b/arch/ppc/xmon/start.c
index d880967390648c86cb92d80317b867e31a59576c..bbe463913e7481a6bb7cf93a5d1716cbdf6e84e7 100644 (file)
--- a/arch/ppc/xmon/start.c
+++ b/arch/ppc/xmon/start.c
@@ -12,6 +12,7 @@
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/sysrq.h>
+#include <linux/bitops.h>
 #include <asm/xmon.h>
 #include <asm/prom.h>
 #include <asm/bootx.h>
@@ -21,9 +22,6 @@
 #include <asm/processor.h>
 #include <asm/delay.h>
 #include <asm/btext.h>
-#ifdef CONFIG_SMP
-#include <asm/bitops.h>
-#endif
 
 static volatile unsigned char *sccc, *sccd;
 unsigned int TXRDY, RXRDY, DLAB;

diff --git a/arch/ppc/xmon/xmon.c b/arch/ppc/xmon/xmon.c
index e7fe8d4c25ee101752cea67c40dd228e8bcde611..9976e7cb5b0d286f005a6068e53c04137ca9c44f 100644 (file)
--- a/arch/ppc/xmon/xmon.c
+++ b/arch/ppc/xmon/xmon.c
@@ -8,10 +8,10 @@
 #include <linux/sched.h>
 #include <linux/smp.h>
 #include <linux/interrupt.h>
+#include <linux/bitops.h>
 #include <asm/ptrace.h>
 #include <asm/string.h>
 #include <asm/prom.h>
-#include <asm/bitops.h>
 #include <asm/bootx.h>
 #include <asm/machdep.h>
 #include <asm/xmon.h>

diff --git a/arch/ppc64/kernel/LparData.c b/arch/ppc64/kernel/LparData.c
index 73d919bf858e247dfcfd8fd2ab46dceded61ef3b..4400095f9501732a4f6b3b2a47d3ced03dbe2478 100644 (file)
--- a/arch/ppc64/kernel/LparData.c
+++ b/arch/ppc64/kernel/LparData.c
@@ -11,11 +11,11 @@
 #include <stddef.h>
 #include <linux/threads.h>
 #include <linux/module.h>
+#include <linux/bitops.h>
 #include <asm/processor.h>
 #include <asm/ptrace.h>
 #include <asm/naca.h>
 #include <asm/abs_addr.h>
-#include <asm/bitops.h>
 #include <asm/iSeries/ItLpNaca.h>
 #include <asm/iSeries/ItLpPaca.h>
 #include <asm/iSeries/ItLpRegSave.h>

diff --git a/arch/ppc64/kernel/bitops.c b/arch/ppc64/kernel/bitops.c
index 6b24b0219090ccb9dc3d49baa29a831d12248f9c..ae329e8b4acbfd66147a3ff1761632f64484e52a 100644 (file)
--- a/arch/ppc64/kernel/bitops.c
+++ b/arch/ppc64/kernel/bitops.c
@@ -4,7 +4,7 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <asm/byteorder.h>
 
 unsigned long find_next_zero_bit(const unsigned long *addr, unsigned long size,

diff --git a/arch/ppc64/kernel/iommu.c b/arch/ppc64/kernel/iommu.c
index d5d64d1d725848f8e520716b9a8df6ec1c6c730e..3c476ee1d89ea5c26b3738f5d5b975617bf309a4 100644 (file)
--- a/arch/ppc64/kernel/iommu.c
+++ b/arch/ppc64/kernel/iommu.c
@@ -33,12 +33,12 @@
 #include <linux/string.h>
 #include <linux/dma-mapping.h>
 #include <linux/init.h>
+#include <linux/bitops.h>
 #include <asm/io.h>
 #include <asm/prom.h>
 #include <asm/iommu.h>
 #include <asm/pci-bridge.h>
 #include <asm/machdep.h>
-#include <asm/bitops.h>
 
 #define DBG(...)
 

diff --git a/arch/ppc64/kernel/irq.c b/arch/ppc64/kernel/irq.c
index 55e5387123ecbf96f9a3b31c023b89a15f393bb6..9410bbf260d39b410070461eb26c651acbf468a3 100644 (file)
--- a/arch/ppc64/kernel/irq.c
+++ b/arch/ppc64/kernel/irq.c
@@ -42,9 +42,9 @@
 #include <linux/random.h>
 #include <linux/kallsyms.h>
 #include <linux/profile.h>
+#include <linux/bitops.h>
 
 #include <asm/uaccess.h>
-#include <asm/bitops.h>
 #include <asm/system.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>

diff --git a/arch/ppc64/kernel/lmb.c b/arch/ppc64/kernel/lmb.c
index 56a26eec0b1a0ea3cb99aa54bb42c5cb15dfb9ae..56d7ba87fe608d386c59a1b6aeff83ce2d736416 100644 (file)
--- a/arch/ppc64/kernel/lmb.c
+++ b/arch/ppc64/kernel/lmb.c
@@ -13,12 +13,12 @@
 #include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
+#include <linux/bitops.h>
 #include <asm/types.h>
 #include <asm/page.h>
 #include <asm/prom.h>
 #include <asm/lmb.h>
 #include <asm/abs_addr.h>
-#include <asm/bitops.h>
 
 struct lmb lmb;
 

diff --git a/arch/ppc64/kernel/pmac_setup.c b/arch/ppc64/kernel/pmac_setup.c
index 3d1de0f9bf83b51e7b1d0c564b8781a54ba6b9e0..49fb814445220436f1c1a8b7c4389ab32c7a2280 100644 (file)
--- a/arch/ppc64/kernel/pmac_setup.c
+++ b/arch/ppc64/kernel/pmac_setup.c
@@ -53,13 +53,12 @@
 #include <linux/irq.h>
 #include <linux/seq_file.h>
 #include <linux/root_dev.h>
+#include <linux/bitops.h>
 
 #include <asm/processor.h>
 #include <asm/sections.h>
 #include <asm/prom.h>
 #include <asm/system.h>
-#include <asm/pgtable.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/pci-bridge.h>
 #include <asm/iommu.h>

diff --git a/arch/ppc64/kernel/ppc_ksyms.c b/arch/ppc64/kernel/ppc_ksyms.c
index 3732fe0482a2962dd3e7aee858d84eaf3fd9a77d..cf543e042665e83b12182cad97c79aafadf19cb1 100644 (file)
--- a/arch/ppc64/kernel/ppc_ksyms.c
+++ b/arch/ppc64/kernel/ppc_ksyms.c
@@ -21,6 +21,7 @@
 #include <linux/delay.h>
 #include <linux/smp_lock.h>
 #include <linux/syscalls.h>
+#include <linux/bitops.h>
 
 #include <asm/page.h>
 #include <asm/semaphore.h>
@@ -28,7 +29,6 @@
 #include <asm/uaccess.h>
 #include <asm/io.h>
 #include <asm/atomic.h>
-#include <asm/bitops.h>
 #include <asm/checksum.h>
 #include <asm/pgtable.h>
 #include <asm/prom.h>

diff --git a/arch/ppc64/kernel/prom.c b/arch/ppc64/kernel/prom.c
index f121ffbc206936ae597a0462f0b45b4729c3baad..f9eec2a5405b759253b45f3ea3906fb21bd8ea7b 100644 (file)
--- a/arch/ppc64/kernel/prom.c
+++ b/arch/ppc64/kernel/prom.c
@@ -31,6 +31,7 @@
 #include <linux/stringify.h>
 #include <linux/delay.h>
 #include <linux/initrd.h>
+#include <linux/bitops.h>
 #include <asm/prom.h>
 #include <asm/rtas.h>
 #include <asm/lmb.h>
@@ -43,7 +44,6 @@
 #include <asm/system.h>
 #include <asm/mmu.h>
 #include <asm/pgtable.h>
-#include <asm/bitops.h>
 #include <asm/naca.h>
 #include <asm/pci.h>
 #include <asm/iommu.h>

diff --git a/arch/ppc64/kernel/prom_init.c b/arch/ppc64/kernel/prom_init.c
index f62bda79e10262060ecc4e7c4da69a6f33df28e4..2add2f88d440ed6c74d555457319c50f5f4da0a3 100644 (file)
--- a/arch/ppc64/kernel/prom_init.c
+++ b/arch/ppc64/kernel/prom_init.c
@@ -31,6 +31,7 @@
 #include <linux/stringify.h>
 #include <linux/delay.h>
 #include <linux/initrd.h>
+#include <linux/bitops.h>
 #include <asm/prom.h>
 #include <asm/rtas.h>
 #include <asm/abs_addr.h>
@@ -42,7 +43,6 @@
 #include <asm/system.h>
 #include <asm/mmu.h>
 #include <asm/pgtable.h>
-#include <asm/bitops.h>
 #include <asm/naca.h>
 #include <asm/pci.h>
 #include <asm/iommu.h>

diff --git a/arch/ppc64/kernel/ras.c b/arch/ppc64/kernel/ras.c
index 75ced99c5d7cdb7346072fe59ad0b76b7cc992d3..06f69b37fe349785f4f996202ff611a4095c02de 100644 (file)
--- a/arch/ppc64/kernel/ras.c
+++ b/arch/ppc64/kernel/ras.c
@@ -37,9 +37,9 @@
 #include <linux/irq.h>
 #include <linux/random.h>
 #include <linux/sysrq.h>
+#include <linux/bitops.h>
 
 #include <asm/uaccess.h>
-#include <asm/bitops.h>
 #include <asm/system.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>

diff --git a/arch/ppc64/kernel/rtas-proc.c b/arch/ppc64/kernel/rtas-proc.c
index bd75066cc047ee7dc5e56957e3556fb41afd6fa4..c857aa14d6b280d53b19d8fc7381e2fdbea494c1 100644 (file)
--- a/arch/ppc64/kernel/rtas-proc.c
+++ b/arch/ppc64/kernel/rtas-proc.c
@@ -22,9 +22,9 @@
 #include <linux/string.h>
 #include <linux/init.h>
 #include <linux/seq_file.h>
+#include <linux/bitops.h>
 
 #include <asm/uaccess.h>
-#include <asm/bitops.h>
 #include <asm/processor.h>
 #include <asm/io.h>
 #include <asm/prom.h>

diff --git a/arch/sh/boards/bigsur/irq.c b/arch/sh/boards/bigsur/irq.c
index 082472448611f957d2b0af2563f55c1d125ca883..c188fc32dc9a8c4f1207d9e59cbc83a3b9178ff9 100644 (file)
--- a/arch/sh/boards/bigsur/irq.c
+++ b/arch/sh/boards/bigsur/irq.c
@@ -29,10 +29,10 @@
 #include <linux/interrupt.h>
 #include <linux/init.h>
 #include <linux/irq.h>
+#include <linux/bitops.h>
 
 #include <asm/io.h>
 #include <asm/irq.h>
-#include <asm/bitops.h>
 
 #include <asm/bigsur/io.h>
 #include <asm/hd64465/hd64465.h>

diff --git a/arch/sh/boards/bigsur/setup.c b/arch/sh/boards/bigsur/setup.c
index 9cb3292692609edc0bed91cf7fcbb2ccc3dc6aca..e69be05195f5a7c765c8a9794f9e2fb663ba0025 100644 (file)
--- a/arch/sh/boards/bigsur/setup.c
+++ b/arch/sh/boards/bigsur/setup.c
@@ -29,10 +29,10 @@
 #include <linux/interrupt.h>
 #include <linux/init.h>
 #include <linux/irq.h>
+#include <linux/bitops.h>
 
 #include <asm/io.h>
 #include <asm/irq.h>
-#include <asm/bitops.h>
 #include <asm/machvec.h>
 #include <asm/bigsur/io.h>
 #include <asm/hd64465/hd64465.h>

diff --git a/arch/sh/kernel/cpu/irq_imask.c b/arch/sh/kernel/cpu/irq_imask.c
index be2c82385d977725faad4e515dc1df113e54ffc6..f76901e732fb801a268fe05cacfa5efd796f231a 100644 (file)
--- a/arch/sh/kernel/cpu/irq_imask.c
+++ b/arch/sh/kernel/cpu/irq_imask.c
@@ -18,10 +18,10 @@
 #include <linux/sched.h>
 #include <linux/interrupt.h>
 #include <linux/init.h>
+#include <linux/bitops.h>
 
 #include <asm/system.h>
 #include <asm/irq.h>
-#include <asm/bitops.h>
 
 #include <linux/spinlock.h>
 #include <linux/cache.h>

diff --git a/arch/sh/kernel/irq.c b/arch/sh/kernel/irq.c
index 73ec3365d0d04568af86ecb7998489cb8156f2f4..9a7d936263fd90cd21eb9f120c4bdbe18049d298 100644 (file)
--- a/arch/sh/kernel/irq.c
+++ b/arch/sh/kernel/irq.c
@@ -31,10 +31,10 @@
 #include <linux/init.h>
 #include <linux/seq_file.h>
 #include <linux/kallsyms.h>
+#include <linux/bitops.h>
 
 #include <asm/system.h>
 #include <asm/io.h>
-#include <asm/bitops.h>
 #include <asm/pgalloc.h>
 #include <asm/delay.h>
 #include <asm/irq.h>

diff --git a/arch/sh64/kernel/irq.c b/arch/sh64/kernel/irq.c
index 7d0f422e113371391a09f787132666218417ea38..b0f138f545a885d91a83a6f1a0b951361941d867 100644 (file)
--- a/arch/sh64/kernel/irq.c
+++ b/arch/sh64/kernel/irq.c
@@ -30,9 +30,9 @@
 #include <linux/smp_lock.h>
 #include <linux/init.h>
 #include <linux/seq_file.h>
+#include <linux/bitops.h>
 #include <asm/system.h>
 #include <asm/io.h>
-#include <asm/bitops.h>
 #include <asm/smp.h>
 #include <asm/pgalloc.h>
 #include <asm/delay.h>

diff --git a/arch/sh64/kernel/irq_intc.c b/arch/sh64/kernel/irq_intc.c
index 4062ae55e1ae4e341708523ec338a960bcc7279e..43f88f3a78b0d219c5910560d0f6eefe0024b669 100644 (file)
--- a/arch/sh64/kernel/irq_intc.c
+++ b/arch/sh64/kernel/irq_intc.c
@@ -20,12 +20,12 @@
 #include <linux/irq.h>
 #include <linux/kernel.h>
 #include <linux/stddef.h>
+#include <linux/bitops.h>       /* this includes also <asm/registers.h */
+                                /* which is required to remap register */
+                                /* names used into __asm__ blocks...   */
 
 #include <asm/hardware.h>
 #include <asm/platform.h>
-#include <asm/bitops.h>                /* this includes also <asm/registers.h */
-                               /* which is required to remap register */
-                               /* names used into __asm__ blocks...   */
 #include <asm/page.h>
 #include <asm/io.h>
 #include <asm/irq.h>

diff --git a/arch/sparc/kernel/signal.c b/arch/sparc/kernel/signal.c
index 276860da53bdb3b6226013286e1bb17ea3dbf064..7f677a39c1a987742818931ee9d88146ef813f78 100644 (file)
--- a/arch/sparc/kernel/signal.c
+++ b/arch/sparc/kernel/signal.c
@@ -20,9 +20,9 @@
 #include <linux/smp.h>
 #include <linux/smp_lock.h>
 #include <linux/binfmts.h>     /* do_coredum */
+#include <linux/bitops.h>
 
 #include <asm/uaccess.h>
-#include <asm/bitops.h>
 #include <asm/ptrace.h>
 #include <asm/svr4.h>
 #include <asm/pgalloc.h>

diff --git a/arch/sparc/lib/bitext.c b/arch/sparc/lib/bitext.c
index f375c8e361dfe0d4bac0ac1093260811780613aa..1e711bb665b7ad2de57898c1b56185b5e022e328 100644 (file)
--- a/arch/sparc/lib/bitext.c
+++ b/arch/sparc/lib/bitext.c
@@ -10,9 +10,9 @@
  */
 
 #include <linux/smp_lock.h>
+#include <linux/bitops.h>
 
 #include <asm/bitext.h>
-#include <asm/bitops.h>
 
 /**
  * bit_map_string_get - find and set a bit string in bit map.

diff --git a/arch/sparc/mm/io-unit.c b/arch/sparc/mm/io-unit.c
index 7eddc56b749f9edd62f906d73344790a9ed37b1f..40b36f0b330799b1c23c998d480051660197b469 100644 (file)
--- a/arch/sparc/mm/io-unit.c
+++ b/arch/sparc/mm/io-unit.c
@@ -11,6 +11,7 @@
 #include <linux/spinlock.h>
 #include <linux/mm.h>
 #include <linux/highmem.h>     /* pte_offset_map => kmap_atomic */
+#include <linux/bitops.h>
 
 #include <asm/scatterlist.h>
 #include <asm/pgalloc.h>
@@ -19,7 +20,6 @@
 #include <asm/io.h>
 #include <asm/io-unit.h>
 #include <asm/mxcc.h>
-#include <asm/bitops.h>
 #include <asm/cacheflush.h>
 #include <asm/tlbflush.h>
 #include <asm/dma.h>

diff --git a/arch/sparc64/kernel/signal.c b/arch/sparc64/kernel/signal.c
index d81bfab517f064195192ee72d39914530d9cf3fc..aa298d31d33c0dbdbe5f648de02dcb9f9f96e373 100644 (file)
--- a/arch/sparc64/kernel/signal.c
+++ b/arch/sparc64/kernel/signal.c
@@ -23,9 +23,9 @@
 #include <linux/tty.h>
 #include <linux/smp_lock.h>
 #include <linux/binfmts.h>
+#include <linux/bitops.h>
 
 #include <asm/uaccess.h>
-#include <asm/bitops.h>
 #include <asm/ptrace.h>
 #include <asm/svr4.h>
 #include <asm/pgtable.h>

diff --git a/arch/sparc64/kernel/signal32.c b/arch/sparc64/kernel/signal32.c
index 63d9cec39754b4ddb2c9e59af788610faf29863d..ab266049499e96c4d4346ebd0b1a4b430b0bc175 100644 (file)
--- a/arch/sparc64/kernel/signal32.c
+++ b/arch/sparc64/kernel/signal32.c
@@ -20,9 +20,9 @@
 #include <linux/smp_lock.h>
 #include <linux/binfmts.h>
 #include <linux/compat.h>
+#include <linux/bitops.h>
 
 #include <asm/uaccess.h>
-#include <asm/bitops.h>
 #include <asm/ptrace.h>
 #include <asm/svr4.h>
 #include <asm/pgtable.h>

diff --git a/arch/sparc64/kernel/unaligned.c b/arch/sparc64/kernel/unaligned.c
index 646a788fa9d2fa3649eead62fcfcd8283e812b41..8a9d3b6bfe5c95c1c522da027e2e50cd1c8216b7 100644 (file)
--- a/arch/sparc64/kernel/unaligned.c
+++ b/arch/sparc64/kernel/unaligned.c
@@ -19,8 +19,8 @@
 #include <asm/uaccess.h>
 #include <linux/smp.h>
 #include <linux/smp_lock.h>
+#include <linux/bitops.h>
 #include <asm/fpumacro.h>
-#include <asm/bitops.h>
 
 /* #define DEBUG_MNA */
 

diff --git a/arch/sparc64/lib/find_bit.c b/arch/sparc64/lib/find_bit.c
index 5852614492bb5aeeb5b7cca13116f3fd599f79ff..27545fbf5da7b1054d1c4616baa937ade3549bb5 100644 (file)
--- a/arch/sparc64/lib/find_bit.c
+++ b/arch/sparc64/lib/find_bit.c
@@ -1,4 +1,4 @@
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 
 /**
  * find_next_bit - find the next set bit in a memory region

diff --git a/arch/v850/kernel/fpga85e2c.c b/arch/v850/kernel/fpga85e2c.c
index 17e3dbafc37184cfa44e889a6f49b8365c958152..af2e804b728383365265fbe0b2bb6900224f463b 100644 (file)
--- a/arch/v850/kernel/fpga85e2c.c
+++ b/arch/v850/kernel/fpga85e2c.c
@@ -20,11 +20,11 @@
 #include <linux/swap.h>
 #include <linux/bootmem.h>
 #include <linux/irq.h>
+#include <linux/bitops.h>
 
 #include <asm/atomic.h>
 #include <asm/page.h>
 #include <asm/machdep.h>
-#include <asm/bitops.h>
 
 #include "mach.h"
 

diff --git a/arch/x86_64/kernel/i8259.c b/arch/x86_64/kernel/i8259.c
index f5d084a990d3bb869bfd34b1d053eb8c2c47523b..7929a2e534a66e586e52c4bdd3ee70c3644c96cf 100644 (file)
--- a/arch/x86_64/kernel/i8259.c
+++ b/arch/x86_64/kernel/i8259.c
@@ -12,6 +12,7 @@
 #include <linux/init.h>
 #include <linux/kernel_stat.h>
 #include <linux/sysdev.h>
+#include <linux/bitops.h>
 
 #include <asm/acpi.h>
 #include <asm/atomic.h>
@@ -19,7 +20,6 @@
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/hw_irq.h>
-#include <asm/bitops.h>
 #include <asm/pgtable.h>
 #include <asm/delay.h>
 #include <asm/desc.h>

diff --git a/arch/x86_64/kernel/pci-gart.c b/arch/x86_64/kernel/pci-gart.c
index ca608a2a0aafcc5158b3cc3a900843b5ce3d9d5c..bf2d2d0bf5d2050e941cd03853797abd01804989 100644 (file)
--- a/arch/x86_64/kernel/pci-gart.c
+++ b/arch/x86_64/kernel/pci-gart.c
@@ -22,10 +22,10 @@
 #include <linux/module.h>
 #include <linux/topology.h>
 #include <linux/interrupt.h>
+#include <linux/bitops.h>
 #include <asm/atomic.h>
 #include <asm/io.h>
 #include <asm/mtrr.h>
-#include <asm/bitops.h>
 #include <asm/pgtable.h>
 #include <asm/proto.h>
 #include <asm/cacheflush.h>

diff --git a/arch/x86_64/kernel/setup64.c b/arch/x86_64/kernel/setup64.c
index b7f2bfa57c55cb5bb8b38943a47e6a7ad7631700..8c68b5d34cf6a8900bc34ef0f9f4d654bcd17bdf 100644 (file)
--- a/arch/x86_64/kernel/setup64.c
+++ b/arch/x86_64/kernel/setup64.c
@@ -11,11 +11,11 @@
 #include <linux/sched.h>
 #include <linux/string.h>
 #include <linux/bootmem.h>
+#include <linux/bitops.h>
 #include <asm/pda.h>
 #include <asm/pgtable.h>
 #include <asm/processor.h>
 #include <asm/desc.h>
-#include <asm/bitops.h>
 #include <asm/atomic.h>
 #include <asm/mmu_context.h>
 #include <asm/smp.h>

diff --git a/arch/x86_64/lib/bitops.c b/arch/x86_64/lib/bitops.c
index 6060dd9084aae7bf4b74d30b3254835fe25f454e..994d766503dd92cde3acecd7a982647b34708081 100644 (file)
--- a/arch/x86_64/lib/bitops.c
+++ b/arch/x86_64/lib/bitops.c
@@ -1,5 +1,5 @@
 #include <linux/module.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 
 #undef find_first_zero_bit
 #undef find_next_zero_bit

diff --git a/arch/x86_64/lib/bitstr.c b/arch/x86_64/lib/bitstr.c
index e7ce82a0a332e0d936a986d0904f164a2884bcb3..24676609a6acbcf12ac2c29a3949b6f21abe199c 100644 (file)
--- a/arch/x86_64/lib/bitstr.c
+++ b/arch/x86_64/lib/bitstr.c
@@ -1,5 +1,5 @@
 #include <linux/module.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 
 /* Find string of zero bits in a bitmap */ 
 unsigned long 

diff --git a/drivers/acorn/block/fd1772.c b/drivers/acorn/block/fd1772.c
index 0e7a399d2470e69f015351408cfc63986ef521ef..9cc2e8436b4504a9991ac952eaaa11a4f01168fb 100644 (file)
--- a/drivers/acorn/block/fd1772.c
+++ b/drivers/acorn/block/fd1772.c
@@ -138,9 +138,9 @@
 #include <linux/types.h>
 #include <linux/delay.h>
 #include <linux/mm.h>
+#include <linux/bitops.h>
 
 #include <asm/arch/oldlatches.h>
-#include <asm/bitops.h>
 #include <asm/dma.h>
 #include <asm/hardware.h>
 #include <asm/hardware/ioc.h>

diff --git a/drivers/block/z2ram.c b/drivers/block/z2ram.c
index 958a5e1f70c75889fa80c1e3d4f86431c651270b..8dc889498306a63fd9bf53b32bee88593e0b3c9f 100644 (file)
--- a/drivers/block/z2ram.c
+++ b/drivers/block/z2ram.c
@@ -32,9 +32,9 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/blkdev.h>
+#include <linux/bitops.h>
 
 #include <asm/setup.h>
-#include <asm/bitops.h>
 #include <asm/amigahw.h>
 #include <asm/pgtable.h>
 

diff --git a/drivers/bluetooth/bt3c_cs.c b/drivers/bluetooth/bt3c_cs.c
index d67d0385f20bdf2caddc7025be270ad6af618c86..305e030eb447200bb4e97f6730bd78b61ceeab23 100644 (file)
--- a/drivers/bluetooth/bt3c_cs.c
+++ b/drivers/bluetooth/bt3c_cs.c
@@ -39,8 +39,8 @@
 #include <linux/string.h>
 #include <linux/serial.h>
 #include <linux/serial_reg.h>
+#include <linux/bitops.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 
 #include <linux/device.h>

diff --git a/drivers/bluetooth/btuart_cs.c b/drivers/bluetooth/btuart_cs.c
index b44fa7dd38c350b07f533a2d3b549e4af2eca9d3..f039c84e8218c40f082bf90a50734e556e21ce55 100644 (file)
--- a/drivers/bluetooth/btuart_cs.c
+++ b/drivers/bluetooth/btuart_cs.c
@@ -38,8 +38,8 @@
 #include <linux/string.h>
 #include <linux/serial.h>
 #include <linux/serial_reg.h>
+#include <linux/bitops.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 
 #include <pcmcia/version.h>

diff --git a/drivers/bluetooth/dtl1_cs.c b/drivers/bluetooth/dtl1_cs.c
index 79ec1ce7841d6aae503f169408f680974eae74e7..91e0a2edf7206d440d0990cecf4cd3373ab52e92 100644 (file)
--- a/drivers/bluetooth/dtl1_cs.c
+++ b/drivers/bluetooth/dtl1_cs.c
@@ -38,8 +38,8 @@
 #include <linux/string.h>
 #include <linux/serial.h>
 #include <linux/serial_reg.h>
+#include <linux/bitops.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 
 #include <pcmcia/version.h>

diff --git a/drivers/char/amiserial.c b/drivers/char/amiserial.c
index bcf906bb24ff5ea0b6612bb53ce81f4dc149d4fe..b657ac4ff7cc9d97ee1a70414465fa11e4feea73 100644 (file)
--- a/drivers/char/amiserial.c
+++ b/drivers/char/amiserial.c
@@ -85,13 +85,13 @@ static char *serial_version = "4.30";
 #include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/delay.h>
+#include <linux/bitops.h>
 
 #include <asm/setup.h>
 
 #include <asm/system.h>
 
 #include <asm/irq.h>
-#include <asm/bitops.h>
 
 #include <asm/amigahw.h>
 #include <asm/amigaints.h>

diff --git a/drivers/char/cyclades.c b/drivers/char/cyclades.c
index 46002d5bada15d90490a4906f3a40ecae749a0a1..d3fd1c9c930196160db2a1c53daff0852ceb944e 100644 (file)
--- a/drivers/char/cyclades.c
+++ b/drivers/char/cyclades.c
@@ -652,12 +652,12 @@ static char rcsid[] =
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/spinlock.h>
+#include <linux/bitops.h>
 
 #include <asm/system.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/uaccess.h>
-#include <asm/bitops.h>
 
 #define        CY_LOCK(info,flags)                                     \
                do {                                            \

diff --git a/drivers/char/ec3104_keyb.c b/drivers/char/ec3104_keyb.c
index b3289d9d23f59425152cd3f9b8c2e6d0a3c4678e..452d45c7b13bfb66ad1ef299fee970acb1dcab9d 100644 (file)
--- a/drivers/char/ec3104_keyb.c
+++ b/drivers/char/ec3104_keyb.c
@@ -43,9 +43,9 @@
 #include <linux/slab.h>
 #include <linux/kbd_kern.h>
 #include <linux/smp_lock.h>
+#include <linux/bitops.h>
 
 #include <asm/keyboard.h>
-#include <asm/bitops.h>
 #include <asm/uaccess.h>
 #include <asm/irq.h>
 #include <asm/system.h>

diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
index e8ad7da73f6fcdd00155a531165886162ad313d5..7ee8a1d70ee85e127633a2367b8b732e6b96b321 100644 (file)
--- a/drivers/char/hpet.c
+++ b/drivers/char/hpet.c
@@ -28,13 +28,13 @@
 #include <linux/wait.h>
 #include <linux/bcd.h>
 #include <linux/seq_file.h>
+#include <linux/bitops.h>
 
 #include <asm/current.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
 #include <asm/io.h>
 #include <asm/irq.h>
-#include <asm/bitops.h>
 #include <asm/div64.h>
 
 #include <linux/acpi.h>

diff --git a/drivers/char/ip2main.c b/drivers/char/ip2main.c
index e0cbd7552eb8fb8a53febdfd1db952ccc4b2a2d6..3d3ae6856bbd79c483ff705933e5ec3f2eaf0012 100644 (file)
--- a/drivers/char/ip2main.c
+++ b/drivers/char/ip2main.c
@@ -112,11 +112,11 @@
 #include <linux/cdk.h>
 #include <linux/comstats.h>
 #include <linux/delay.h>
+#include <linux/bitops.h>
 
 #include <asm/system.h>
 #include <asm/io.h>
 #include <asm/irq.h>
-#include <asm/bitops.h>
 
 #include <linux/vmalloc.h>
 #include <linux/init.h>

diff --git a/drivers/char/moxa.c b/drivers/char/moxa.c
index 11373907f29f7a4a4b9c360849acedd6a08dc195..36b90e0870315e79f253abc7b6c41fc7f5a98210 100644 (file)
--- a/drivers/char/moxa.c
+++ b/drivers/char/moxa.c
@@ -50,10 +50,10 @@
 #include <linux/delay.h>
 #include <linux/pci.h>
 #include <linux/init.h>
+#include <linux/bitops.h>
 
 #include <asm/system.h>
 #include <asm/io.h>
-#include <asm/bitops.h>
 #include <asm/uaccess.h>
 
 #define                MOXA_VERSION            "5.1k"

diff --git a/drivers/char/mwave/3780i.c b/drivers/char/mwave/3780i.c
index 8832ed21d4129cf729a86660902466da0fe26256..0dee98b146fb0222118c9ff9e08cb04ac0e973c2 100644 (file)
--- a/drivers/char/mwave/3780i.c
+++ b/drivers/char/mwave/3780i.c
@@ -52,11 +52,11 @@
 #include <linux/delay.h>
 #include <linux/ioport.h>
 #include <linux/init.h>
+#include <linux/bitops.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
 #include <asm/irq.h>
-#include <asm/bitops.h>
 #include "smapi.h"
 #include "mwavedd.h"
 #include "3780i.h"

diff --git a/drivers/char/n_hdlc.c b/drivers/char/n_hdlc.c
index 3e10c700d6858424751d92e1c5d2fc8188bfb6b5..0a684d8cc112fb1ca5c484fff7e8e5d883363778 100644 (file)
--- a/drivers/char/n_hdlc.c
+++ b/drivers/char/n_hdlc.c
@@ -103,9 +103,9 @@
 #include <linux/string.h>      /* used in new tty drivers */
 #include <linux/signal.h>      /* used in new tty drivers */
 #include <linux/if.h>
+#include <linux/bitops.h>
 
 #include <asm/system.h>
-#include <asm/bitops.h>
 #include <asm/termios.h>
 #include <asm/uaccess.h>
 

diff --git a/drivers/char/n_tty.c b/drivers/char/n_tty.c
index 5a3be050e7bf0ba45cb83da487465910a0286321..3bca97c2ae45751627a02eabeefc1c1e1641929e 100644 (file)
--- a/drivers/char/n_tty.c
+++ b/drivers/char/n_tty.c
@@ -44,10 +44,10 @@
 #include <linux/string.h>
 #include <linux/slab.h>
 #include <linux/poll.h>
+#include <linux/bitops.h>
 
 #include <asm/uaccess.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
 
 /* number of characters left in xmit buffer before select has we have room */
 #define WAKEUP_CHARS 256

diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
index f334dbfcf21f7c81582126f59b57ce07132ff36f..522de1ec92c486fc250a98f671410bddfb2be47f 100644 (file)
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
@@ -65,7 +65,7 @@
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/dma.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <asm/types.h>
 #include <linux/termios.h>
 #include <linux/workqueue.h>

diff --git a/drivers/char/pcxx.c b/drivers/char/pcxx.c
index 97fd9da9c5ef6cf56191712dbdd642907960f22e..d489a1322e0dff93e9d57171f1276ed8ffa98814 100644 (file)
--- a/drivers/char/pcxx.c
+++ b/drivers/char/pcxx.c
@@ -65,6 +65,7 @@
 #include <linux/tty_driver.h>
 #include <linux/slab.h>
 #include <linux/init.h>
+#include <linux/bitops.h>
 
 #ifndef MODULE
 #include <linux/ctype.h> /* We only need it for parsing the "digi="-line */
@@ -73,7 +74,6 @@
 #include <asm/system.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
-#include <asm/bitops.h>
 #include <asm/semaphore.h>
 
 #define VERSION        "1.6.3"

diff --git a/drivers/char/pty.c b/drivers/char/pty.c
index 9826bbd0f67a475985ff3a47f9de9130f335afa8..2e0eda2d40bf2360c77d295a70ab64b8c8676ed3 100644 (file)
--- a/drivers/char/pty.c
+++ b/drivers/char/pty.c
@@ -29,7 +29,7 @@
 
 #include <asm/uaccess.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <linux/devpts_fs.h>
 
 /* These are global because they are accessed in tty_io.c */

diff --git a/drivers/char/qtronix.c b/drivers/char/qtronix.c
index 4698af2d62e36924d1eac0e1d4a57e6ae4d15549..e0bb00f3c05d789ffd8c0558d8d53eea16e7fdc1 100644 (file)
--- a/drivers/char/qtronix.c
+++ b/drivers/char/qtronix.c
@@ -79,7 +79,7 @@
 #include <linux/pc_keyb.h>
 
 #include <asm/keyboard.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <asm/uaccess.h>
 #include <asm/irq.h>
 #include <asm/system.h>

diff --git a/drivers/char/rocket.c b/drivers/char/rocket.c
index 9f13fad3fc1128b1bca5eebc042e9171dfaab296..4a0840ed50c907eb7bc60df70a30a7bf39db5826 100644 (file)
--- a/drivers/char/rocket.c
+++ b/drivers/char/rocket.c
@@ -91,7 +91,7 @@
 #include <linux/pci.h>
 #include <asm/uaccess.h>
 #include <asm/atomic.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <linux/spinlock.h>
 #include <asm/semaphore.h>
 #include <linux/init.h>

diff --git a/drivers/char/serial167.c b/drivers/char/serial167.c
index b2538a6b85b096227ce9c394c621e738efd96daa..028044f79045566547415f834826617b2b5e109e 100644 (file)
--- a/drivers/char/serial167.c
+++ b/drivers/char/serial167.c
@@ -59,10 +59,10 @@
 #include <linux/mm.h>
 #include <linux/console.h>
 #include <linux/module.h>
+#include <linux/bitops.h>
 
 #include <asm/system.h>
 #include <asm/io.h>
-#include <asm/bitops.h>
 #include <asm/mvme16xhw.h>
 #include <asm/bootinfo.h>
 #include <asm/setup.h>

diff --git a/drivers/char/synclink.c b/drivers/char/synclink.c
index edf89fffe4e1a93452477e357f9295eb39b34bf7..84224b99353ff8d35d00aff4830e8c4170b80858 100644 (file)
--- a/drivers/char/synclink.c
+++ b/drivers/char/synclink.c
@@ -97,7 +97,7 @@
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/dma.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <asm/types.h>
 #include <linux/termios.h>
 #include <linux/workqueue.h>

diff --git a/drivers/char/synclinkmp.c b/drivers/char/synclinkmp.c
index 9ccce79fdf4e6f39c15cb845ada922b006215bba..cb4de2ebb15ec7d48d7baae56ffd0de08f3eef0a 100644 (file)
--- a/drivers/char/synclinkmp.c
+++ b/drivers/char/synclinkmp.c
@@ -63,7 +63,7 @@
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/dma.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <asm/types.h>
 #include <linux/termios.h>
 #include <linux/workqueue.h>

diff --git a/drivers/char/tipar.c b/drivers/char/tipar.c
index 48d7a7cc0c2bbe2b10c876ef8432f136f1d6c68b..2fd2901ffc457fe5bc6994b21e92090ebde17cfb 100644 (file)
--- a/drivers/char/tipar.c
+++ b/drivers/char/tipar.c
@@ -55,7 +55,7 @@
 #include <asm/uaccess.h>
 #include <linux/ioport.h>
 #include <asm/io.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <linux/devfs_fs_kernel.h>     /* DevFs support */
 #include <linux/parport.h>     /* Our code depend on parport */
 #include <linux/device.h>

diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index 9d5e4ba9dc2559b38fc223b80db778ac28e7f88a..b27ae629e6e296827aef7723b1cb4c9f175f57ac 100644 (file)
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -93,10 +93,10 @@
 #include <linux/device.h>
 #include <linux/idr.h>
 #include <linux/wait.h>
+#include <linux/bitops.h>
 
 #include <asm/uaccess.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
 
 #include <linux/kbd_kern.h>
 #include <linux/vt_kern.h>

diff --git a/drivers/char/tty_ioctl.c b/drivers/char/tty_ioctl.c
index 830c665a3bd58f584ec618c491603199a62b251e..d1060b2d5579a2920fe0696ea5ea388d110e46db 100644 (file)
--- a/drivers/char/tty_ioctl.c
+++ b/drivers/char/tty_ioctl.c
@@ -19,9 +19,9 @@
 #include <linux/string.h>
 #include <linux/mm.h>
 #include <linux/module.h>
+#include <linux/bitops.h>
 
 #include <asm/io.h>
-#include <asm/bitops.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
 

diff --git a/drivers/char/vt.c b/drivers/char/vt.c
index cffa77b926290893e05cb2c00f71a88c132c4755..185d19ab12140efd178d461a8f111685d5feba58 100644 (file)
--- a/drivers/char/vt.c
+++ b/drivers/char/vt.c
@@ -101,11 +101,11 @@
 #include <linux/bootmem.h>
 #include <linux/pm.h>
 #include <linux/font.h>
+#include <linux/bitops.h>
 
 #include <asm/io.h>
 #include <asm/system.h>
 #include <asm/uaccess.h>
-#include <asm/bitops.h>
 
 #include "console_macros.h"
 

diff --git a/drivers/char/watchdog/ixp2000_wdt.c b/drivers/char/watchdog/ixp2000_wdt.c
index ebcaf79ce8bcab8688c5b9f77bd8ba246bdde0b4..ab659d37b4d2bb4aa0dc50e932c512adea781e59 100644 (file)
--- a/drivers/char/watchdog/ixp2000_wdt.c
+++ b/drivers/char/watchdog/ixp2000_wdt.c
@@ -25,9 +25,9 @@
 #include <linux/miscdevice.h>
 #include <linux/watchdog.h>
 #include <linux/init.h>
+#include <linux/bitops.h>
 
 #include <asm/hardware.h>
-#include <asm/bitops.h>
 #include <asm/uaccess.h>
 
 #ifdef CONFIG_WATCHDOG_NOWAYOUT

diff --git a/drivers/char/watchdog/ixp4xx_wdt.c b/drivers/char/watchdog/ixp4xx_wdt.c
index a6781dede6c82a22a3464a58b2605e8f52faa8c4..eb13091b8b15043368209189ffc25e89c47e305d 100644 (file)
--- a/drivers/char/watchdog/ixp4xx_wdt.c
+++ b/drivers/char/watchdog/ixp4xx_wdt.c
@@ -22,9 +22,9 @@
 #include <linux/miscdevice.h>
 #include <linux/watchdog.h>
 #include <linux/init.h>
+#include <linux/bitops.h>
 
 #include <asm/hardware.h>
-#include <asm/bitops.h>
 #include <asm/uaccess.h>
 
 #ifdef CONFIG_WATCHDOG_NOWAYOUT

diff --git a/drivers/fc4/soc.c b/drivers/fc4/soc.c
index 3f8b4c15115dbb420f7974c13da2c4d5cbee0db4..392e216696d969b4f7e4cf42c3b4a7b9ea1d3d9f 100644 (file)
--- a/drivers/fc4/soc.c
+++ b/drivers/fc4/soc.c
@@ -32,7 +32,7 @@ static char *version =
 #include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/init.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 #include <linux/errno.h>

diff --git a/drivers/fc4/socal.c b/drivers/fc4/socal.c
index 5ee4dda537431635cdeddbc9bd2751b71af54717..162985ca9d579981ded01629313b9d7b62e73871 100644 (file)
--- a/drivers/fc4/socal.c
+++ b/drivers/fc4/socal.c
@@ -27,8 +27,8 @@ static char *version =
 #include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/init.h>
+#include <linux/bitops.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 #include <linux/errno.h>

diff --git a/drivers/ide/ide-default.c b/drivers/ide/ide-default.c
index ef6e2c8c21d33c3ba028ff2336bc50cf491bc1e3..a6bea5d0de036f5d7df61093e00f13798e50694a 100644 (file)
--- a/drivers/ide/ide-default.c
+++ b/drivers/ide/ide-default.c
@@ -23,13 +23,13 @@
 #include <linux/slab.h>
 #include <linux/cdrom.h>
 #include <linux/ide.h>
+#include <linux/bitops.h>
 
 #include <asm/byteorder.h>
 #include <asm/irq.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
 #include <asm/unaligned.h>
-#include <asm/bitops.h>
 
 #define IDEDEFAULT_VERSION     "0.9.newide"
 /*

diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index 3b092c387193e314eb1b368233c8d525cae49bf1..39819daed56c95419115e339f230241fd190ca10 100644 (file)
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -97,13 +97,13 @@
 #include <linux/slab.h>
 #include <linux/cdrom.h>
 #include <linux/ide.h>
+#include <linux/bitops.h>
 
 #include <asm/byteorder.h>
 #include <asm/irq.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
 #include <asm/unaligned.h>
-#include <asm/bitops.h>
 
 /*
  *     The following are used to debug the driver.

diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index c104120ae669c9d07d671b35a0341bc552759940..d2316daebd38e574666926a43d05080ee8985efe 100644 (file)
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -23,12 +23,12 @@
 #include <linux/delay.h>
 #include <linux/hdreg.h>
 #include <linux/ide.h>
+#include <linux/bitops.h>
 
 #include <asm/byteorder.h>
 #include <asm/irq.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
-#include <asm/bitops.h>
 
 /*
  *     Conventional PIO operations for ATA devices

diff --git a/drivers/ide/ide-lib.c b/drivers/ide/ide-lib.c
index b2fa5eccdcad483f8df2218fbf2bf48269d63bb4..8acad305be8b3f9e872a61db5c7d0881b549b6ed 100644 (file)
--- a/drivers/ide/ide-lib.c
+++ b/drivers/ide/ide-lib.c
@@ -15,12 +15,12 @@
 #include <linux/delay.h>
 #include <linux/hdreg.h>
 #include <linux/ide.h>
+#include <linux/bitops.h>
 
 #include <asm/byteorder.h>
 #include <asm/irq.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
-#include <asm/bitops.h>
 
 /*
  *     IDE library routines. These are plug in code that most 

diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
index 3ec7ff671c65262fbebf104b89cf67528c04774a..82e471ffd71379a7233f5b81175db534eb256575 100644 (file)
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@ -442,13 +442,13 @@
 #include <linux/ide.h>
 #include <linux/smp_lock.h>
 #include <linux/completion.h>
+#include <linux/bitops.h>
 
 #include <asm/byteorder.h>
 #include <asm/irq.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
 #include <asm/unaligned.h>
-#include <asm/bitops.h>
 
 /*
  * partition

diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index 4a8019475c02684de1eb69bcee245a761062ec6f..c7eea8dd31a37b7968e8b75820f393e406aeeec4 100644 (file)
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -44,12 +44,12 @@
 #include <linux/delay.h>
 #include <linux/hdreg.h>
 #include <linux/ide.h>
+#include <linux/bitops.h>
 
 #include <asm/byteorder.h>
 #include <asm/irq.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
-#include <asm/bitops.h>
 
 #define DEBUG_TASKFILE 0       /* unset when fixed */
 

diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 5f0a4352721985cb4d154bf5a8404e01fbb56813..75baad1eafcae26d7bf80b7c9b77f6ab985b898e 100644 (file)
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -153,12 +153,12 @@
 #include <linux/cdrom.h>
 #include <linux/seq_file.h>
 #include <linux/device.h>
+#include <linux/bitops.h>
 
 #include <asm/byteorder.h>
 #include <asm/irq.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
-#include <asm/bitops.h>
 
 
 /* default maximum number of failures */

diff --git a/drivers/input/serio/q40kbd.c b/drivers/input/serio/q40kbd.c
index 7d5ecce92346fd0a5da5c1db07f10e1164fb8c34..a56ea2b73f125685928d0d703d6490c7ec494a00 100644 (file)
--- a/drivers/input/serio/q40kbd.c
+++ b/drivers/input/serio/q40kbd.c
@@ -36,8 +36,8 @@
 #include <linux/serio.h>
 #include <linux/interrupt.h>
 #include <linux/err.h>
+#include <linux/bitops.h>
 
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
 #include <asm/q40_master.h>

diff --git a/drivers/isdn/i4l/isdn_bsdcomp.c b/drivers/isdn/i4l/isdn_bsdcomp.c
index fd80b86388a9b0de003d34725366486cc67d9d4e..baf4bcad9bf93a825c34941ea57e9f244b1d5bff 100644 (file)
--- a/drivers/isdn/i4l/isdn_bsdcomp.c
+++ b/drivers/isdn/i4l/isdn_bsdcomp.c
@@ -68,9 +68,9 @@
 #include <linux/errno.h>
 #include <linux/string.h>      /* used in new tty drivers */
 #include <linux/signal.h>      /* used in new tty drivers */
+#include <linux/bitops.h>
 
 #include <asm/system.h>
-#include <asm/bitops.h>
 #include <asm/byteorder.h>
 #include <asm/types.h>
 

diff --git a/drivers/macintosh/macserial.c b/drivers/macintosh/macserial.c
index a3a5372f7aeb3723123a37d4eaf75d440b318b0a..e35a141adaa624ac19366e9c21c4e6f12a455952 100644 (file)
--- a/drivers/macintosh/macserial.c
+++ b/drivers/macintosh/macserial.c
@@ -32,6 +32,7 @@
 #include <linux/console.h>
 #endif
 #include <linux/slab.h>
+#include <linux/bitops.h>
 
 #include <asm/sections.h>
 #include <asm/io.h>
@@ -40,7 +41,6 @@
 #include <asm/prom.h>
 #include <asm/system.h>
 #include <asm/segment.h>
-#include <asm/bitops.h>
 #include <asm/machdep.h>
 #include <asm/pmac_feature.h>
 #include <linux/adb.h>

diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index d1f54a9ad324d8fffb9344ce0de2a0c5f9398d1d..e5f6bb754f5a6f4513e7e56bbe1fda6b413cab38 100644 (file)
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -21,7 +21,7 @@
 #include <linux/slab.h>
 #include <linux/raid/raid5.h>
 #include <linux/highmem.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <asm/atomic.h>
 
 /*

diff --git a/drivers/md/raid6main.c b/drivers/md/raid6main.c
index aea1a1be5845bdd526712296503726470fdf265e..b6050c837bb64ec21ee5950b362f9b5f3db486e1 100644 (file)
--- a/drivers/md/raid6main.c
+++ b/drivers/md/raid6main.c
@@ -25,7 +25,7 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/highmem.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <asm/atomic.h>
 #include "raid6.h"
 

diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
index e33fdd99b3d3cfcb81fef5dc1583a4a15b43b9b8..f53ce50411a277204c618f68f709addc65fefffc 100644 (file)
--- a/drivers/media/dvb/bt8xx/dvb-bt8xx.c
+++ b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
@@ -19,7 +19,7 @@
  *
  */
 
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/init.h>

diff --git a/drivers/media/dvb/frontends/at76c651.c b/drivers/media/dvb/frontends/at76c651.c
index 0dceacee31d53fdf06f3881a13e73cee8598a364..d221723ac909e1accfa6a8cc8f7336aea95c704f 100644 (file)
--- a/drivers/media/dvb/frontends/at76c651.c
+++ b/drivers/media/dvb/frontends/at76c651.c
@@ -35,10 +35,7 @@
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/slab.h>
-
-#if defined(__powerpc__)
-#include <asm/bitops.h>
-#endif
+#include <linux/bitops.h>
 
 #include "dvb_frontend.h"
 

diff --git a/drivers/media/dvb/ttpci/av7110_ir.c b/drivers/media/dvb/ttpci/av7110_ir.c
index f3fed48366cfe10aef86f959c408f122b5d5dd74..32292be4bacc9f222b04c9a1490f212d8036e66d 100644 (file)
--- a/drivers/media/dvb/ttpci/av7110_ir.c
+++ b/drivers/media/dvb/ttpci/av7110_ir.c
@@ -4,7 +4,7 @@
 #include <linux/moduleparam.h>
 #include <linux/input.h>
 #include <linux/proc_fs.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 
 #include "av7110.h"
 

diff --git a/drivers/net/3c501.c b/drivers/net/3c501.c
index 0c99115637bfda1dc7d877b5cdb7258937798005..7628bda82c91ba8954ded0f62122a2503be9cff5 100644 (file)
--- a/drivers/net/3c501.c
+++ b/drivers/net/3c501.c
@@ -124,9 +124,9 @@ static const char version[] =
 #include <linux/spinlock.h>
 #include <linux/ethtool.h>
 #include <linux/delay.h>
+#include <linux/bitops.h>
 
 #include <asm/uaccess.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 
 #include <linux/netdevice.h>

diff --git a/drivers/net/3c505.c b/drivers/net/3c505.c
index 3aa8409fe5f9dc0c0373e0f10f49ea5ce439dea5..6bff013a941dd9614f8b40da76efdb0530376e82 100644 (file)
--- a/drivers/net/3c505.c
+++ b/drivers/net/3c505.c
@@ -107,9 +107,9 @@
 #include <linux/spinlock.h>
 #include <linux/ethtool.h>
 #include <linux/delay.h>
+#include <linux/bitops.h>
 
 #include <asm/uaccess.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 

diff --git a/drivers/net/3c507.c b/drivers/net/3c507.c
index 4866a09c07089c66c125984cf422ad64f072a1c5..8c2a06bfefc7e234247df3a5be0ccb76af012498 100644 (file)
--- a/drivers/net/3c507.c
+++ b/drivers/net/3c507.c
@@ -59,8 +59,8 @@ static const char version[] =
 #include <linux/skbuff.h>
 #include <linux/slab.h>
 #include <linux/init.h>
+#include <linux/bitops.h>
 
-#include <asm/bitops.h>
 #include <asm/dma.h>
 #include <asm/io.h>
 #include <asm/system.h>

diff --git a/drivers/net/3c509.c b/drivers/net/3c509.c
index b053f53bb13e44292b8ab83e78ee9bb99024cca4..7d25f2e36fc75d37d19876b0fd1286ae52676c6e 100644 (file)
--- a/drivers/net/3c509.c
+++ b/drivers/net/3c509.c
@@ -90,9 +90,9 @@ static int max_interrupt_work = 10;
 #include <linux/ethtool.h>
 #include <linux/device.h>
 #include <linux/eisa.h>
+#include <linux/bitops.h>
 
 #include <asm/uaccess.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 

diff --git a/drivers/net/3c515.c b/drivers/net/3c515.c
index bcdc0d60846aad7efeca7b0d5d44431fb55d26cd..7dca6e585e6645fb09234a21c50a509c018eb6af 100644 (file)
--- a/drivers/net/3c515.c
+++ b/drivers/net/3c515.c
@@ -72,9 +72,9 @@ static int max_interrupt_work = 20;
 #include <linux/interrupt.h>
 #include <linux/timer.h>
 #include <linux/ethtool.h>
+#include <linux/bitops.h>
 
 #include <asm/uaccess.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 

diff --git a/drivers/net/3c523.c b/drivers/net/3c523.c
index 1902f792199e407a23f868b182795c66158dcdbb..0a5df59d46fd102a7c9912813582c6307eab3fcb 100644 (file)
--- a/drivers/net/3c523.c
+++ b/drivers/net/3c523.c
@@ -104,10 +104,10 @@
 #include <linux/delay.h>
 #include <linux/mca-legacy.h>
 #include <linux/ethtool.h>
+#include <linux/bitops.h>
 
 #include <asm/uaccess.h>
 #include <asm/processor.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 
 #include "3c523.h"

diff --git a/drivers/net/3c527.c b/drivers/net/3c527.c
index a39c446c3429dba5c11cc68889f487068b7bbe44..15550b1442f8431aeb46a7b4593f0e4e505f7ce4 100644 (file)
--- a/drivers/net/3c527.c
+++ b/drivers/net/3c527.c
@@ -102,11 +102,11 @@ DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " Richard Procter <rnp@paradise.net.
 #include <linux/wait.h>
 #include <linux/ethtool.h>
 #include <linux/completion.h>
+#include <linux/bitops.h>
 
 #include <asm/semaphore.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 

diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c
index adcbf685335736294910c219d09e0c1cb1622be7..5b45341d3a6a38aaa87b0dd599b3fe7944fae5f2 100644 (file)
--- a/drivers/net/3c59x.c
+++ b/drivers/net/3c59x.c
@@ -257,8 +257,8 @@ static int vortex_debug = 1;
 #include <linux/ethtool.h>
 #include <linux/highmem.h>
 #include <linux/eisa.h>
+#include <linux/bitops.h>
 #include <asm/irq.h>                   /* For NR_IRQS only. */
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
 

diff --git a/drivers/net/7990.c b/drivers/net/7990.c
index 0e5aec0d57d17d1a50196607bd74d5da373dadea..a18ecab2063793500d81d3bc66d3871b67a79ff6 100644 (file)
--- a/drivers/net/7990.c
+++ b/drivers/net/7990.c
@@ -32,9 +32,9 @@
 #include <linux/skbuff.h>
 /* Used for the temporal inet entries and routing */
 #include <linux/socket.h>
+#include <linux/bitops.h>
 
 #include <asm/system.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 #include <asm/pgtable.h>

diff --git a/drivers/net/82596.c b/drivers/net/82596.c
index c835712edef9b509e94e5958f31bf9929cb64856..33bcdf612cbab5e37e1d84240d6b221d3bcadf97 100644 (file)
--- a/drivers/net/82596.c
+++ b/drivers/net/82596.c
@@ -53,8 +53,8 @@
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
 #include <linux/init.h>
+#include <linux/bitops.h>
 
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 #include <asm/pgtable.h>

diff --git a/drivers/net/8390.c b/drivers/net/8390.c
index 04dcacda870d000deecec934312c3cfc258db3ed..c89a6128940135e9cd9f8793d0d3c64cb66e8b9f 100644 (file)
--- a/drivers/net/8390.c
+++ b/drivers/net/8390.c
@@ -58,9 +58,9 @@ static const char version[] =
 #include <linux/fs.h>
 #include <linux/types.h>
 #include <linux/string.h>
+#include <linux/bitops.h>
 #include <asm/system.h>
 #include <asm/uaccess.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <linux/delay.h>

diff --git a/drivers/net/a2065.c b/drivers/net/a2065.c
index 0d95f0bf964c12aac89f6779fb3a19d55041cf47..8e538a6d7d9793565e3095c8daa3ad755ec630d5 100644 (file)
--- a/drivers/net/a2065.c
+++ b/drivers/net/a2065.c
@@ -52,8 +52,8 @@
 #include <linux/init.h>
 #include <linux/crc32.h>
 #include <linux/zorro.h>
+#include <linux/bitops.h>
 
-#include <asm/bitops.h>
 #include <asm/irq.h>
 #include <asm/amigaints.h>
 #include <asm/amigahw.h>

diff --git a/drivers/net/appletalk/cops.c b/drivers/net/appletalk/cops.c
index 925dd04774fa1b25635427f46847e92e70dcda09..00bb1b2ae4a0e10d7cac9fb4d106a86ea104d608 100644 (file)
--- a/drivers/net/appletalk/cops.c
+++ b/drivers/net/appletalk/cops.c
@@ -69,9 +69,9 @@ static const char *version =
 #include <linux/delay.h>       /* For udelay() */
 #include <linux/atalk.h>
 #include <linux/spinlock.h>
+#include <linux/bitops.h>
 
 #include <asm/system.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 

diff --git a/drivers/net/appletalk/ltpc.c b/drivers/net/appletalk/ltpc.c
index 70a7a181b8d86f3282454bb87ddf04a0cdcf64cf..118503bc38237f624a2cb4bce6f9b7d0ffcb8ad4 100644 (file)
--- a/drivers/net/appletalk/ltpc.c
+++ b/drivers/net/appletalk/ltpc.c
@@ -227,9 +227,9 @@ static int dma;
 #include <linux/delay.h>
 #include <linux/timer.h>
 #include <linux/atalk.h>
+#include <linux/bitops.h>
 
 #include <asm/system.h>
-#include <asm/bitops.h>
 #include <asm/dma.h>
 #include <asm/io.h>
 

diff --git a/drivers/net/ariadne.c b/drivers/net/ariadne.c
index 10a94c54427eb13ab4fc24252979310a35ff2d68..9fe93acfc8efa5adfcc86aef7c9186108d9b1c41 100644 (file)
--- a/drivers/net/ariadne.c
+++ b/drivers/net/ariadne.c
@@ -47,8 +47,8 @@
 #include <linux/skbuff.h>
 #include <linux/init.h>
 #include <linux/zorro.h>
+#include <linux/bitops.h>
 
-#include <asm/bitops.h>
 #include <asm/amigaints.h>
 #include <asm/amigahw.h>
 #include <asm/irq.h>

diff --git a/drivers/net/arm/am79c961a.c b/drivers/net/arm/am79c961a.c
index a6d42aa9fac58b33862235688c4e09c74232d1ca..9b659e3c8d674280bc283dd99f7a872c7b2b7d0d 100644 (file)
--- a/drivers/net/arm/am79c961a.c
+++ b/drivers/net/arm/am79c961a.c
@@ -28,9 +28,9 @@
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/crc32.h>
+#include <linux/bitops.h>
 
 #include <asm/system.h>
-#include <asm/bitops.h>
 #include <asm/irq.h>
 #include <asm/io.h>
 #include <asm/dma.h>

diff --git a/drivers/net/arm/ether1.c b/drivers/net/arm/ether1.c
index fb401b27c3b1b48849b4b8de2b9c3c12bebbe8d6..6118f09c63cf335a938474e1508921665860295e 100644 (file)
--- a/drivers/net/arm/ether1.c
+++ b/drivers/net/arm/ether1.c
@@ -48,9 +48,9 @@
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
+#include <linux/bitops.h>
 
 #include <asm/system.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 #include <asm/ecard.h>

diff --git a/drivers/net/arm/ether3.c b/drivers/net/arm/ether3.c
index d054876b9673cebf19fb038dab720f4859e52e8c..e0d22a31ea1214c0d310b04f2b68ae882f1830ef 100644 (file)
--- a/drivers/net/arm/ether3.c
+++ b/drivers/net/arm/ether3.c
@@ -64,9 +64,9 @@
 #include <linux/device.h>
 #include <linux/init.h>
 #include <linux/delay.h>
+#include <linux/bitops.h>
 
 #include <asm/system.h>
-#include <asm/bitops.h>
 #include <asm/ecard.h>
 #include <asm/io.h>
 #include <asm/irq.h>

diff --git a/drivers/net/arm/etherh.c b/drivers/net/arm/etherh.c
index d861c54a7766aff4ec1f0f5c6863b8b58b695ceb..f3f1a483f8ca2d050ad97301eff41fd86c065ea5 100644 (file)
--- a/drivers/net/arm/etherh.c
+++ b/drivers/net/arm/etherh.c
@@ -44,9 +44,9 @@
 #include <linux/delay.h>
 #include <linux/device.h>
 #include <linux/init.h>
+#include <linux/bitops.h>
 
 #include <asm/system.h>
-#include <asm/bitops.h>
 #include <asm/ecard.h>
 #include <asm/io.h>
 #include <asm/irq.h>

diff --git a/drivers/net/at1700.c b/drivers/net/at1700.c
index a3e7e63c39a6a4710802d27e269fed41a977a552..0dcf27a51dd677d0ba25799c992e0f6538bb97a0 100644 (file)
--- a/drivers/net/at1700.c
+++ b/drivers/net/at1700.c
@@ -56,9 +56,9 @@
 #include <linux/string.h>
 #include <linux/init.h>
 #include <linux/crc32.h>
+#include <linux/bitops.h>
 
 #include <asm/system.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 

diff --git a/drivers/net/atari_bionet.c b/drivers/net/atari_bionet.c
index 92a2ec2e51da02bff1d83d16d2d6bf661667a103..1798ce7262c9b0b0ddea69042646abc5827c8bf8 100644 (file)
--- a/drivers/net/atari_bionet.c
+++ b/drivers/net/atari_bionet.c
@@ -97,6 +97,7 @@ static char version[] =
 #include <linux/delay.h>
 #include <linux/timer.h>
 #include <linux/init.h>
+#include <linux/bitops.h>
 
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
@@ -105,7 +106,6 @@ static char version[] =
 #include <asm/setup.h>
 #include <asm/pgtable.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 #include <asm/atarihw.h>

diff --git a/drivers/net/atari_pamsnet.c b/drivers/net/atari_pamsnet.c
index c74e5866293ae80c44eed0dcbd9952749897344f..81c362c8cb973949557550a89e45b45c2268aa3f 100644 (file)
--- a/drivers/net/atari_pamsnet.c
+++ b/drivers/net/atari_pamsnet.c
@@ -88,9 +88,9 @@ static char *version =
 #include <linux/in.h>
 #include <linux/slab.h>
 #include <linux/string.h>
+#include <linux/bitops.h>
 #include <asm/system.h>
 #include <asm/pgtable.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 #include <linux/errno.h>

diff --git a/drivers/net/atarilance.c b/drivers/net/atarilance.c
index e462e2fca538ceda57e18f487af43730902bf730..a5dfb1276c2d13c7386f77b5180a9decdb684971 100644 (file)
--- a/drivers/net/atarilance.c
+++ b/drivers/net/atarilance.c
@@ -56,12 +56,12 @@ static char version[] = "atarilance.c: v1.3 04/04/96 "
 #include <linux/slab.h>
 #include <linux/interrupt.h>
 #include <linux/init.h>
+#include <linux/bitops.h>
 
 #include <asm/setup.h>
 #include <asm/irq.h>
 #include <asm/atarihw.h>
 #include <asm/atariints.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 
 /* Debug level:

diff --git a/drivers/net/atp.c b/drivers/net/atp.c
index fd2e033fecc1c5ebb1585b4c76bc8342d1ffe57a..662e40f3003119ae5672dfcc9c1b61c4b966a74f 100644 (file)
--- a/drivers/net/atp.c
+++ b/drivers/net/atp.c
@@ -141,9 +141,9 @@ static int xcvr[NUM_UNITS];                         /* The data transfer mode. */
 #include <linux/skbuff.h>
 #include <linux/spinlock.h>
 #include <linux/delay.h>
+#include <linux/bitops.h>
 
 #include <asm/system.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 

diff --git a/drivers/net/au1000_eth.c b/drivers/net/au1000_eth.c
index afcdcffc7847c3559905ac23b835c082494e087f..3328ed511bf8aea09e50346e7822bf5ad407fcaf 100644 (file)
--- a/drivers/net/au1000_eth.c
+++ b/drivers/net/au1000_eth.c
@@ -36,10 +36,10 @@
 #include <linux/skbuff.h>
 #include <linux/delay.h>
 #include <linux/crc32.h>
+#include <linux/bitops.h>
 
 #include <asm/mipsregs.h>
 #include <asm/irq.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/au1000.h>
 

diff --git a/drivers/net/bagetlance.c b/drivers/net/bagetlance.c
index e62ad3ad6e58d37332db9c17491983d1cff80343..55a0f66f6cf80c92d3a18b7dfe4d7258a90a0f34 100644 (file)
--- a/drivers/net/bagetlance.c
+++ b/drivers/net/bagetlance.c
@@ -25,9 +25,9 @@ static char *version = "bagetlance.c: v1.1 11/10/98\n";
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
+#include <linux/bitops.h>
 
 #include <asm/irq.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/baget/baget.h>
 

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 6917b665b65a481ef109e8a3760d38904fbb8158..e1097f90c883eeda6925c75c738ace9ac0acbd55 100644 (file)
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -491,8 +491,8 @@
 #include <linux/socket.h>
 #include <linux/ctype.h>
 #include <linux/inet.h>
+#include <linux/bitops.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 #include <asm/uaccess.h>

diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c
index 3ce3237b1686eda19cc8fd175fde6d78a656fdf7..e8c74071fed35e203b372893670d88a2ea9cff09 100644 (file)
--- a/drivers/net/cs89x0.c
+++ b/drivers/net/cs89x0.c
@@ -135,9 +135,9 @@
 #include <linux/spinlock.h>
 #include <linux/string.h>
 #include <linux/init.h>
+#include <linux/bitops.h>
 
 #include <asm/system.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 #if ALLOW_DMA
 #include <asm/dma.h>

diff --git a/drivers/net/defxx.c b/drivers/net/defxx.c
index 85d1bb3a9865da2581ade75a2c2eebd69890a304..c7ef439ea1deef23cfb20b816d3e07a57c9cb0e1 100644 (file)
--- a/drivers/net/defxx.c
+++ b/drivers/net/defxx.c
@@ -207,9 +207,9 @@
 #include <linux/netdevice.h>
 #include <linux/fddidevice.h>
 #include <linux/skbuff.h>
+#include <linux/bitops.h>
 
 #include <asm/byteorder.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 
 #include "defxx.h"

diff --git a/drivers/net/depca.c b/drivers/net/depca.c
index 5d62a032b8c876af6b046f09037e061b31c68b30..49ebfbe6cff83a4ca2254f2a635dafe180dcfcea 100644 (file)
--- a/drivers/net/depca.c
+++ b/drivers/net/depca.c
@@ -255,9 +255,9 @@
 #include <linux/ctype.h>
 #include <linux/moduleparam.h>
 #include <linux/device.h>
+#include <linux/bitops.h>
 
 #include <asm/uaccess.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 

diff --git a/drivers/net/dgrs.c b/drivers/net/dgrs.c
index 639aa7508502cc15887adb433292677b84e1f2a5..779af1727eef9071b40fa1057cdd322f9b0e93a1 100644 (file)
--- a/drivers/net/dgrs.c
+++ b/drivers/net/dgrs.c
@@ -97,8 +97,8 @@
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
+#include <linux/bitops.h>
 
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/byteorder.h>
 #include <asm/uaccess.h>

diff --git a/drivers/net/dl2k.h b/drivers/net/dl2k.h
index d4636739259569d9af548a883c1490350367ce44..6e75482d75f266e7b81b0637343785e1b096a683 100644 (file)
--- a/drivers/net/dl2k.h
+++ b/drivers/net/dl2k.h
@@ -28,8 +28,8 @@
 #include <linux/init.h>
 #include <linux/crc32.h>
 #include <linux/ethtool.h>
+#include <linux/bitops.h>
 #include <asm/processor.h>     /* Processor type for cache alignment. */
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
 #include <linux/delay.h>

diff --git a/drivers/net/e1000/e1000.h b/drivers/net/e1000/e1000.h
index 1951644a9afc5058ed8ee6be30d64e3be9a9454c..30c7d5433b698b6a033157b8f2c520bca4cc0984 100644 (file)
--- a/drivers/net/e1000/e1000.h
+++ b/drivers/net/e1000/e1000.h
@@ -54,7 +54,7 @@
 #include <linux/string.h>
 #include <linux/pagemap.h>
 #include <linux/dma-mapping.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <linux/capability.h>

diff --git a/drivers/net/eepro.c b/drivers/net/eepro.c
index 9f5ea60758b1c89634f9a186b24ed3f627649875..3f05a33e7c69df7b4eed099a1edd8a40eba1e533 100644 (file)
--- a/drivers/net/eepro.c
+++ b/drivers/net/eepro.c
@@ -145,9 +145,9 @@ static const char version[] =
 #include <linux/spinlock.h>
 #include <linux/init.h>
 #include <linux/delay.h>
+#include <linux/bitops.h>
 
 #include <asm/system.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 

diff --git a/drivers/net/eepro100.c b/drivers/net/eepro100.c
index 13850a3177c0ed390364bef8ffbb5779a7809466..e02b6aec703adff043633d99ebdde0776ed75f70 100644 (file)
--- a/drivers/net/eepro100.c
+++ b/drivers/net/eepro100.c
@@ -102,8 +102,8 @@ static int options[] = {-1, -1, -1, -1, -1, -1, -1, -1};
 #include <linux/init.h>
 #include <linux/mii.h>
 #include <linux/delay.h>
+#include <linux/bitops.h>
 
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
 #include <asm/irq.h>

diff --git a/drivers/net/eexpress.c b/drivers/net/eexpress.c
index 1880fc0ba665a699f6bb0515421ecaa061f8e80f..8d0585f7841b3f88882af569771de87234f05743 100644 (file)
--- a/drivers/net/eexpress.c
+++ b/drivers/net/eexpress.c
@@ -115,9 +115,9 @@
 #include <linux/slab.h>
 #include <linux/mca-legacy.h>
 #include <linux/spinlock.h>
+#include <linux/bitops.h>
 
 #include <asm/system.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 

diff --git a/drivers/net/epic100.c b/drivers/net/epic100.c
index ec327ad3a33f410ce0a79f02f2d1d681f7c28eb4..459013762bd8aa019b4c61e43482ffd9d0ffdc63 100644 (file)
--- a/drivers/net/epic100.c
+++ b/drivers/net/epic100.c
@@ -133,7 +133,7 @@ static int rx_copybreak;
 #include <linux/ethtool.h>
 #include <linux/mii.h>
 #include <linux/crc32.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
 

diff --git a/drivers/net/eth16i.c b/drivers/net/eth16i.c
index 5a9ae260f3d636b931948d6f4f2816382acdaf4b..39f6782707052a606ba524cf7a765565a64cbfb2 100644 (file)
--- a/drivers/net/eth16i.c
+++ b/drivers/net/eth16i.c
@@ -160,9 +160,9 @@ static char *version =
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
+#include <linux/bitops.h>
 
 #include <asm/system.h>                  
-#include <asm/bitops.h>                  
 #include <asm/io.h>              
 #include <asm/dma.h>
 

diff --git a/drivers/net/ewrk3.c b/drivers/net/ewrk3.c
index ccc8c52669e3bdf7de431da7bc1d706dd111d993..8f995141b5181bb2d1fa73069f98286265745f70 100644 (file)
--- a/drivers/net/ewrk3.c
+++ b/drivers/net/ewrk3.c
@@ -161,8 +161,8 @@
 #include <linux/types.h>
 #include <linux/unistd.h>
 #include <linux/ctype.h>
+#include <linux/bitops.h>
 
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 #include <asm/uaccess.h>

diff --git a/drivers/net/fealnx.c b/drivers/net/fealnx.c
index 9112ca037315542bab14670d82845fe8f69bae4a..fddc5360fd1cfd192fff6439a3c7ea9de8e346de 100644 (file)
--- a/drivers/net/fealnx.c
+++ b/drivers/net/fealnx.c
@@ -85,9 +85,9 @@ static int full_duplex[MAX_UNITS] = { -1, -1, -1, -1, -1, -1, -1, -1 };
 #include <linux/ethtool.h>
 #include <linux/crc32.h>
 #include <linux/delay.h>
+#include <linux/bitops.h>
 
 #include <asm/processor.h>     /* Processor type for cache alignment. */
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
 

diff --git a/drivers/net/fec.c b/drivers/net/fec.c
index b9e59da66b563010241cccfa097039e3c4538fc4..645122086a9401bfcf659d4726ca307966848926 100644 (file)
--- a/drivers/net/fec.c
+++ b/drivers/net/fec.c
@@ -39,9 +39,9 @@
 #include <linux/skbuff.h>
 #include <linux/spinlock.h>
 #include <linux/workqueue.h>
+#include <linux/bitops.h>
 
 #include <asm/irq.h>
-#include <asm/bitops.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>

diff --git a/drivers/net/fec_8xx/fec_8xx-netta.c b/drivers/net/fec_8xx/fec_8xx-netta.c
index 7d73661aa36787d71278c3ffc27625e2a2510356..29c275e1d566f5c25c0d3adac39836a13d6bb540 100644 (file)
--- a/drivers/net/fec_8xx/fec_8xx-netta.c
+++ b/drivers/net/fec_8xx/fec_8xx-netta.c
@@ -21,12 +21,12 @@
 #include <linux/spinlock.h>
 #include <linux/mii.h>
 #include <linux/ethtool.h>
+#include <linux/bitops.h>
 
 #include <asm/8xx_immap.h>
 #include <asm/pgtable.h>
 #include <asm/mpc8xx.h>
 #include <asm/irq.h>
-#include <asm/bitops.h>
 #include <asm/uaccess.h>
 #include <asm/commproc.h>
 

diff --git a/drivers/net/fec_8xx/fec_main.c b/drivers/net/fec_8xx/fec_main.c
index 1bf15eed626ab2cdae34a9fabd67bb9cdb00014d..b4f3a9f8a535ac0814920057f9eaf6a134ead9c9 100644 (file)
--- a/drivers/net/fec_8xx/fec_main.c
+++ b/drivers/net/fec_8xx/fec_main.c
@@ -30,12 +30,12 @@
 #include <linux/spinlock.h>
 #include <linux/mii.h>
 #include <linux/ethtool.h>
+#include <linux/bitops.h>
 
 #include <asm/8xx_immap.h>
 #include <asm/pgtable.h>
 #include <asm/mpc8xx.h>
 #include <asm/irq.h>
-#include <asm/bitops.h>
 #include <asm/uaccess.h>
 #include <asm/commproc.h>
 #include <asm/dma-mapping.h>

diff --git a/drivers/net/fec_8xx/fec_mii.c b/drivers/net/fec_8xx/fec_mii.c
index 700233655e5296a3c5956ef79ad2ce5867e22895..8fd1495fafe2e94636fae9d967a61cedd35d421e 100644 (file)
--- a/drivers/net/fec_8xx/fec_mii.c
+++ b/drivers/net/fec_8xx/fec_mii.c
@@ -30,12 +30,12 @@
 #include <linux/spinlock.h>
 #include <linux/mii.h>
 #include <linux/ethtool.h>
+#include <linux/bitops.h>
 
 #include <asm/8xx_immap.h>
 #include <asm/pgtable.h>
 #include <asm/mpc8xx.h>
 #include <asm/irq.h>
-#include <asm/bitops.h>
 #include <asm/uaccess.h>
 #include <asm/commproc.h>
 

diff --git a/drivers/net/fmv18x.c b/drivers/net/fmv18x.c
index f0b6f9c9dcfb1860bd81121bffda6448f2ba9248..04c748523471f0ef6cecee52435ace2ec47c8f9a 100644 (file)
--- a/drivers/net/fmv18x.c
+++ b/drivers/net/fmv18x.c
@@ -51,9 +51,9 @@ static const char version[] =
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
 #include <linux/delay.h>
+#include <linux/bitops.h>
 
 #include <asm/system.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 

diff --git a/drivers/net/gt96100eth.c b/drivers/net/gt96100eth.c
index a41ccc45200726862bc5a87e55f1ce51348afdbc..b6f1e8be445b3544953fb14e05a421209b04e2f2 100644 (file)
--- a/drivers/net/gt96100eth.c
+++ b/drivers/net/gt96100eth.c
@@ -44,9 +44,9 @@
 #include <linux/skbuff.h>
 #include <linux/delay.h>
 #include <linux/ctype.h>
+#include <linux/bitops.h>
 
 #include <asm/irq.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 
 #define DESC_BE 1

diff --git a/drivers/net/hamachi.c b/drivers/net/hamachi.c
index 7dda9988e13b607a34ba3c80627be767e69c39ef..9b885efadf002355d0ae822b9ed488a63916b956 100644 (file)
--- a/drivers/net/hamachi.c
+++ b/drivers/net/hamachi.c
@@ -170,10 +170,10 @@ static int tx_params[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1};
 #include <linux/skbuff.h>
 #include <linux/ip.h>
 #include <linux/delay.h>
+#include <linux/bitops.h>
 
 #include <asm/uaccess.h>
 #include <asm/processor.h>     /* Processor type for cache alignment. */
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/unaligned.h>
 #include <asm/cache.h>

diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c
index e6dba5623add40ba8613f9217c4203b2981aff5a..738cef65b728ab5194c4194362bae5278ee9dae3 100644 (file)
--- a/drivers/net/hamradio/6pack.c
+++ b/drivers/net/hamradio/6pack.c
@@ -16,7 +16,7 @@
 #include <linux/module.h>
 #include <asm/system.h>
 #include <asm/uaccess.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <linux/string.h>
 #include <linux/mm.h>
 #include <linux/interrupt.h>

diff --git a/drivers/net/hamradio/baycom_par.c b/drivers/net/hamradio/baycom_par.c
index 4bd7c09656d831511405cbc60f96cd9126468e8d..77f29fdde8efc850acd6f9a3d01240c967628935 100644 (file)
--- a/drivers/net/hamradio/baycom_par.c
+++ b/drivers/net/hamradio/baycom_par.c
@@ -83,9 +83,9 @@
 #include <linux/hdlcdrv.h>
 #include <linux/baycom.h>
 #include <linux/parport.h>
+#include <linux/bitops.h>
 
 #include <asm/system.h>
-#include <asm/bitops.h>
 #include <asm/uaccess.h>
 
 /* --------------------------------------------------------------------- */

diff --git a/drivers/net/hamradio/hdlcdrv.c b/drivers/net/hamradio/hdlcdrv.c
index 86deb52100be1c383f515d67dbc9a3a30cdc5aaf..8e115b5a6a1187c040fc971428b661ba74e7d5ab 100644 (file)
--- a/drivers/net/hamradio/hdlcdrv.c
+++ b/drivers/net/hamradio/hdlcdrv.c
@@ -51,7 +51,7 @@
 #include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/init.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <asm/uaccess.h>
 
 #include <linux/netdevice.h>

diff --git a/drivers/net/hamradio/mkiss.c b/drivers/net/hamradio/mkiss.c
index e2a28b5624461120994cd0b3fcb09646cc8329eb..d51712a17fd362b678dc7d1984071084c2a1df61 100644 (file)
--- a/drivers/net/hamradio/mkiss.c
+++ b/drivers/net/hamradio/mkiss.c
@@ -30,7 +30,7 @@
 #include <linux/config.h>
 #include <linux/module.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <asm/uaccess.h>
 #include <linux/string.h>
 #include <linux/mm.h>

diff --git a/drivers/net/hamradio/scc.c b/drivers/net/hamradio/scc.c
index 2049556d1764f4b93da0fa9cfca993fc118530ec..8da1948026c6333471d0dc1c0c95ebbae4261288 100644 (file)
--- a/drivers/net/hamradio/scc.c
+++ b/drivers/net/hamradio/scc.c
@@ -173,6 +173,7 @@
 #include <linux/kernel.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
+#include <linux/bitops.h>
 
 #include <net/ax25.h>
 
@@ -180,7 +181,6 @@
 #include <asm/system.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
-#include <asm/bitops.h>
 
 #include "z8530.h"
 

diff --git a/drivers/net/hamradio/yam.c b/drivers/net/hamradio/yam.c
index c516e7156ca135514471991bf162403f5b0c0990..acae5949a9ea68ab7c69a4b396fc6c571c8e25ce 100644 (file)
--- a/drivers/net/hamradio/yam.c
+++ b/drivers/net/hamradio/yam.c
@@ -50,7 +50,7 @@
 #include <linux/if.h>
 #include <linux/slab.h>
 #include <linux/errno.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <asm/io.h>
 #include <asm/system.h>
 #include <linux/interrupt.h>

diff --git a/drivers/net/hp100.c b/drivers/net/hp100.c
index 675ad8f523dbd6bc464141ed3bb55472a963eb37..2392d4523a3d87c81e1ea3920ff526fbee2cc9ec 100644 (file)
--- a/drivers/net/hp100.c
+++ b/drivers/net/hp100.c
@@ -114,8 +114,8 @@
 #include <linux/config.h>      /* for CONFIG_PCI */
 #include <linux/delay.h>
 #include <linux/init.h>
+#include <linux/bitops.h>
 
-#include <asm/bitops.h>
 #include <asm/io.h>
 
 #include "hp100.h"

diff --git a/drivers/net/hydra.c b/drivers/net/hydra.c
index fecaec10291d7deb6d2499b77cbcf8a66cec7f5d..6e0ca7340a8fd9126d2837e94ddf4730e7e214e3 100644 (file)
--- a/drivers/net/hydra.c
+++ b/drivers/net/hydra.c
@@ -23,8 +23,8 @@
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
 #include <linux/init.h>
+#include <linux/bitops.h>
 
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/amigaints.h>

diff --git a/drivers/net/ibm_emac/ibm_emac_core.c b/drivers/net/ibm_emac/ibm_emac_core.c
index 6b0328fbc97be893cd3686f59b3b5c7bdeb04d86..a68b29245b90cc8f6542c2e57f1135f43057c838 100644 (file)
--- a/drivers/net/ibm_emac/ibm_emac_core.c
+++ b/drivers/net/ibm_emac/ibm_emac_core.c
@@ -40,9 +40,9 @@
 #include <linux/dma-mapping.h>
 #include <linux/ethtool.h>
 #include <linux/mii.h>
+#include <linux/bitops.h>
 
 #include <asm/processor.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 #include <asm/irq.h>

diff --git a/drivers/net/ibmlana.c b/drivers/net/ibmlana.c
index 0aa0a826128c86d9f27b87008b05403d0b16dafc..e58b31c918a9f6843e1077a72a0ce37116d340dd 100644 (file)
--- a/drivers/net/ibmlana.c
+++ b/drivers/net/ibmlana.c
@@ -88,9 +88,9 @@ History:
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
+#include <linux/bitops.h>
 
 #include <asm/processor.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 
 #define _IBM_LANA_DRIVER_

diff --git a/drivers/net/irda/au1k_ir.c b/drivers/net/irda/au1k_ir.c
index c5af0cb78905cf67ffc165f0c4d0a7b66bef6bb8..a02a2a25aa073178300188c6e103525cfdb78593 100644 (file)
--- a/drivers/net/irda/au1k_ir.c
+++ b/drivers/net/irda/au1k_ir.c
@@ -28,9 +28,9 @@
 #include <linux/rtnetlink.h>
 #include <linux/interrupt.h>
 #include <linux/pm.h>
+#include <linux/bitops.h>
 
 #include <asm/irq.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/au1000.h>
 #if defined(CONFIG_MIPS_PB1000) || defined(CONFIG_MIPS_PB1100)

diff --git a/drivers/net/irda/irport.c b/drivers/net/irda/irport.c
index 6ad80edb2efa824641a3a6ef9cba9acb4df90425..c2c26b605357a1d08563fd934529b819f32ea40f 100644 (file)
--- a/drivers/net/irda/irport.c
+++ b/drivers/net/irda/irport.c
@@ -51,9 +51,9 @@
 #include <linux/spinlock.h>
 #include <linux/delay.h>
 #include <linux/rtnetlink.h>
+#include <linux/bitops.h>
 
 #include <asm/system.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 
 #include <net/irda/irda.h>

diff --git a/drivers/net/isa-skeleton.c b/drivers/net/isa-skeleton.c
index 6509433950878b6dd0b363c09138794bb4b6a673..50bebb55e9ee4c2293fe10423d8639fe3f65b6a6 100644 (file)
--- a/drivers/net/isa-skeleton.c
+++ b/drivers/net/isa-skeleton.c
@@ -55,9 +55,9 @@ static const char *version =
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
+#include <linux/bitops.h>
 
 #include <asm/system.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 

diff --git a/drivers/net/ixgb/ixgb.h b/drivers/net/ixgb/ixgb.h
index 24311a57a376b9315418086774e7926daef0692a..d5c6f477f91676d72e6fb9b5b9620bf931f2b9c9 100644 (file)
--- a/drivers/net/ixgb/ixgb.h
+++ b/drivers/net/ixgb/ixgb.h
@@ -50,7 +50,7 @@
 #include <linux/string.h>
 #include <linux/pagemap.h>
 #include <linux/dma-mapping.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <linux/capability.h>

diff --git a/drivers/net/jazzsonic.c b/drivers/net/jazzsonic.c
index 8624bfc4905b196699c21873e619e6b0ae876498..7046c439526601dc3c7c43a64d1cf8b296c75004 100644 (file)
--- a/drivers/net/jazzsonic.c
+++ b/drivers/net/jazzsonic.c
@@ -27,10 +27,10 @@
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
+#include <linux/bitops.h>
 
 #include <asm/bootinfo.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
 #include <asm/pgtable.h>
 #include <asm/io.h>
 #include <asm/dma.h>

diff --git a/drivers/net/lance.c b/drivers/net/lance.c
index f04d0a82cf3b847b6e7aacf87a215703b62fbf84..87acad34266f420190d56e194979bcac6faef3d2 100644 (file)
--- a/drivers/net/lance.c
+++ b/drivers/net/lance.c
@@ -56,8 +56,8 @@ static const char version[] = "lance.c:v1.15ac 1999/11/13 dplatt@3do.com, becker
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
+#include <linux/bitops.h>
 
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 

diff --git a/drivers/net/lasi_82596.c b/drivers/net/lasi_82596.c
index b315acb1436206cf4c62b807741c6beeab6b8ba4..188562f701303542d207f099a03d42531c1f2624 100644 (file)
--- a/drivers/net/lasi_82596.c
+++ b/drivers/net/lasi_82596.c
@@ -83,8 +83,8 @@
 #include <linux/init.h>
 #include <linux/pci.h>
 #include <linux/types.h>
+#include <linux/bitops.h>
 
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>
 #include <asm/irq.h>

diff --git a/drivers/net/lp486e.c b/drivers/net/lp486e.c
index c87d90a837fb2eefc9072ff826d167171b8a4d38..70be2a9e3820e2e178216cdc41ac63461910c964 100644 (file)
--- a/drivers/net/lp486e.c
+++ b/drivers/net/lp486e.c
@@ -70,8 +70,8 @@ All other communication is through memory!
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
+#include <linux/bitops.h>
 
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 

diff --git a/drivers/net/mac8390.c b/drivers/net/mac8390.c
index 0a8094eb30610dfd384baa60dbe64b30d509526a..c4d742f6701322279dd7380f04a60eac61757b25 100644 (file)
--- a/drivers/net/mac8390.c
+++ b/drivers/net/mac8390.c
@@ -32,9 +32,9 @@
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
+#include <linux/bitops.h>
 
 #include <asm/system.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 #include <asm/hwtest.h>

diff --git a/drivers/net/macsonic.c b/drivers/net/macsonic.c
index e67bf67f122f0da1fc05021b1fd730df24a939c7..a4dde8181d253c48db3bd8bdf1dedaceaa8ecfa1 100644 (file)
--- a/drivers/net/macsonic.c
+++ b/drivers/net/macsonic.c
@@ -42,10 +42,10 @@
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
 #include <linux/module.h>
+#include <linux/bitops.h>
 
 #include <asm/bootinfo.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
 #include <asm/pgtable.h>
 #include <asm/io.h>
 #include <asm/hwtest.h>

diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 41d38b3b3b4f2d9c185c3cf38d118f5d79dae708..362fee325e0ac9b56db4224504075c1e949af548 100644 (file)
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -49,7 +49,7 @@
 #include <linux/etherdevice.h>
 #include <net/ip.h>
 
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <asm/io.h>
 #include <asm/types.h>
 #include <asm/pgtable.h>

diff --git a/drivers/net/myri_sbus.c b/drivers/net/myri_sbus.c
index c5f95959ccbec1ecadfb0d0ccc0ef491a1e269ed..d85e04bd74900838b83059aaaa48f1ae6dbd48ee 100644 (file)
--- a/drivers/net/myri_sbus.c
+++ b/drivers/net/myri_sbus.c
@@ -22,6 +22,7 @@ static char version[] =
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
+#include <linux/bitops.h>
 
 #include <net/dst.h>
 #include <net/arp.h>
@@ -29,7 +30,6 @@ static char version[] =
 #include <net/ipv6.h>
 
 #include <asm/system.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 #include <asm/byteorder.h>

diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c
index 41d93758bb3c37d9a5afeb0b583fada04760e173..5bb12dc93496a99aeffb5b3c5b0558dace6d567f 100644 (file)
--- a/drivers/net/natsemi.c
+++ b/drivers/net/natsemi.c
@@ -159,8 +159,8 @@
 #include <linux/rtnetlink.h>
 #include <linux/mii.h>
 #include <linux/crc32.h>
+#include <linux/bitops.h>
 #include <asm/processor.h>     /* Processor type for cache alignment. */
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/uaccess.h>

diff --git a/drivers/net/ne2.c b/drivers/net/ne2.c
index 5d690c9f1d2544cbcee4f24d817e639fa39521b7..4fe6e75748555887dfa0e6fd717b5dd46083e383 100644 (file)
--- a/drivers/net/ne2.c
+++ b/drivers/net/ne2.c
@@ -74,9 +74,9 @@ static const char *version = "ne2.c:v0.91 Nov 16 1998 Wim Dumon <wimpie@kotnet.o
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
+#include <linux/bitops.h>
 
 #include <asm/system.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 

diff --git a/drivers/net/ni5010.c b/drivers/net/ni5010.c
index 8124ad6716981f2d6ad01910c3b7868275308ec8..2ab01a5d1d229a0b8c16263055b7148f6a0f9a62 100644 (file)
--- a/drivers/net/ni5010.c
+++ b/drivers/net/ni5010.c
@@ -59,7 +59,7 @@
 #include <linux/interrupt.h>
 #include <linux/delay.h>
 #include <linux/init.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 

diff --git a/drivers/net/ni52.c b/drivers/net/ni52.c
index 234709ded74655006a35a29db5cd206360bcfb35..a76c8575ccff5077f17d805e286c1941aebc5929 100644 (file)
--- a/drivers/net/ni52.c
+++ b/drivers/net/ni52.c
@@ -115,7 +115,7 @@ static int fifo=0x8;        /* don't change */
 #include <linux/interrupt.h>
 #include <linux/delay.h>
 #include <linux/init.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <asm/io.h>
 
 #include <linux/netdevice.h>

diff --git a/drivers/net/ni65.c b/drivers/net/ni65.c
index c43c4cf9e837b7b320116786b7e22ff7b8a1fb3c..fd58f0d9e6445faabe03b8d41695578f2000a05d 100644 (file)
--- a/drivers/net/ni65.c
+++ b/drivers/net/ni65.c
@@ -73,8 +73,8 @@
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
 #include <linux/module.h>
+#include <linux/bitops.h>
 
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 

diff --git a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/pcmcia/3c574_cs.c
index 7c4ed0ddd12a63f2995d4a2eae9b1405c4592b8f..b5c99d2f37b6d120e9a89fa1fe4c0c2f269274a5 100644 (file)
--- a/drivers/net/pcmcia/3c574_cs.c
+++ b/drivers/net/pcmcia/3c574_cs.c
@@ -84,6 +84,7 @@ earlier 3Com products.
 #include <linux/if_arp.h>
 #include <linux/ioport.h>
 #include <linux/ethtool.h>
+#include <linux/bitops.h>
 
 #include <pcmcia/version.h>
 #include <pcmcia/cs_types.h>
@@ -97,7 +98,6 @@ earlier 3Com products.
 #include <asm/uaccess.h>
 #include <asm/io.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
 
 /*====================================================================*/
 

diff --git a/drivers/net/pcmcia/3c589_cs.c b/drivers/net/pcmcia/3c589_cs.c
index 2e0135dad5479858af3c5f2606fc6429f151f5da..970ed7bb596fa876c37f911c440de89d260dbe66 100644 (file)
--- a/drivers/net/pcmcia/3c589_cs.c
+++ b/drivers/net/pcmcia/3c589_cs.c
@@ -38,6 +38,7 @@
 #include <linux/skbuff.h>
 #include <linux/if_arp.h>
 #include <linux/ioport.h>
+#include <linux/bitops.h>
 
 #include <pcmcia/version.h>
 #include <pcmcia/cs_types.h>
@@ -50,7 +51,6 @@
 #include <asm/uaccess.h>
 #include <asm/io.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
 
 /* To minimize the size of the driver source I only define operating
    constants if they are used several times.  You'll need the manual

diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c
index 0d9a06f8c5610010284b4851d68632dd305df3cc..3029129ae650c86b5774fffc74413878b7caa1a8 100644 (file)
--- a/drivers/net/pcmcia/axnet_cs.c
+++ b/drivers/net/pcmcia/axnet_cs.c
@@ -936,7 +936,7 @@ module_exit(exit_axnet_cs);
 static const char *version_8390 =
     "8390.c:v1.10cvs 9/23/94 Donald Becker (becker@scyld.com)\n";
 
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <asm/irq.h>
 #include <linux/fcntl.h>
 #include <linux/in.h>

diff --git a/drivers/net/pcmcia/nmclan_cs.c b/drivers/net/pcmcia/nmclan_cs.c
index 947dad4ca55ad73642f0c1d1fdf6c14fb0a49dae..0ec78c327343a993afbf6a176b088b506004dfa7 100644 (file)
--- a/drivers/net/pcmcia/nmclan_cs.c
+++ b/drivers/net/pcmcia/nmclan_cs.c
@@ -144,6 +144,7 @@ Include Files
 #include <linux/skbuff.h>
 #include <linux/if_arp.h>
 #include <linux/ioport.h>
+#include <linux/bitops.h>
 
 #include <pcmcia/version.h>
 #include <pcmcia/cs_types.h>
@@ -155,7 +156,6 @@ Include Files
 #include <asm/uaccess.h>
 #include <asm/io.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
 
 /* ----------------------------------------------------------------------------
 Defines

diff --git a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c
index 5be2ba3b03e81510acbca7ba79a4fdf045ee783f..25c2fc991405f2196b354aa3abe0b01be71deece 100644 (file)
--- a/drivers/net/pcmcia/xirc2ps_cs.c
+++ b/drivers/net/pcmcia/xirc2ps_cs.c
@@ -79,6 +79,7 @@
 #include <linux/skbuff.h>
 #include <linux/if_arp.h>
 #include <linux/ioport.h>
+#include <linux/bitops.h>
 
 #include <pcmcia/version.h>
 #include <pcmcia/cs_types.h>
@@ -89,7 +90,6 @@
 
 #include <asm/io.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
 #include <asm/uaccess.h>
 
 #ifndef MANFID_COMPAQ

diff --git a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c
index a0af06c18a23c1d66cb105def6e9ddcc7567c41e..74d9062dc1c97c70c821d94136e92f32a7bef516 100644 (file)
--- a/drivers/net/pcnet32.c
+++ b/drivers/net/pcnet32.c
@@ -47,8 +47,8 @@ DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " tsbogend@alpha.franken.de\n";
 #include <linux/skbuff.h>
 #include <linux/spinlock.h>
 #include <linux/moduleparam.h>
+#include <linux/bitops.h>
 
-#include <asm/bitops.h>
 #include <asm/dma.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>

diff --git a/drivers/net/plip.c b/drivers/net/plip.c
index 937b6198c2294f4804fa6757b4fcf69b9f58aeb3..3dd010328f16b85c17e784c084c102c923e98e20 100644 (file)
--- a/drivers/net/plip.c
+++ b/drivers/net/plip.c
@@ -109,11 +109,11 @@ static const char version[] = "NET3 PLIP version 2.4-parport gniibe@mri.co.jp\n"
 #include <linux/ioport.h>
 #include <linux/spinlock.h>
 #include <linux/parport.h>
+#include <linux/bitops.h>
 
 #include <net/neighbour.h>
 
 #include <asm/system.h>
-#include <asm/bitops.h>
 #include <asm/irq.h>
 #include <asm/byteorder.h>
 #include <asm/semaphore.h>

diff --git a/drivers/net/sb1000.c b/drivers/net/sb1000.c
index 03f28fdc0629f355a6aff21574449b51adf7dbf1..dcc64eb8dc4a0e9d7da12620ef0fcfc85294eb88 100644 (file)
--- a/drivers/net/sb1000.c
+++ b/drivers/net/sb1000.c
@@ -50,8 +50,8 @@ static char version[] = "sb1000.c:v1.1.2 6/01/98 (fventuri@mediaone.net)\n";
 #include <linux/etherdevice.h>
 #include <linux/pnp.h>
 #include <linux/init.h>
+#include <linux/bitops.h>
 
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/processor.h>
 #include <asm/uaccess.h>

diff --git a/drivers/net/sb1250-mac.c b/drivers/net/sb1250-mac.c
index e0f88fbd33f58ee35a601b8e8347e9fa47fc6738..1534679529d27474012fb8ff6c3981956e8effa7 100644 (file)
--- a/drivers/net/sb1250-mac.c
+++ b/drivers/net/sb1250-mac.c
@@ -68,8 +68,8 @@ static int int_timeout = 0;
 #include <linux/skbuff.h>
 #include <linux/init.h>
 #include <linux/config.h>
+#include <linux/bitops.h>
 #include <asm/processor.h>             /* Processor type for cache alignment. */
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/cache.h>
 

diff --git a/drivers/net/seeq8005.c b/drivers/net/seeq8005.c
index 0f237b54d5b30e5c44ab05260b7701d7b7e42f78..d9fd9300473069305e584811e35ae4e77834d0dc 100644 (file)
--- a/drivers/net/seeq8005.c
+++ b/drivers/net/seeq8005.c
@@ -45,9 +45,9 @@ static const char version[] =
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
+#include <linux/bitops.h>
 
 #include <asm/system.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 

diff --git a/drivers/net/sgiseeq.c b/drivers/net/sgiseeq.c
index b71f45f5cb5839163fbe34581cec986092185558..4385cd1677a00bda11c3613150b721df867b71fd 100644 (file)
--- a/drivers/net/sgiseeq.c
+++ b/drivers/net/sgiseeq.c
@@ -19,11 +19,11 @@
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
+#include <linux/bitops.h>
 
 #include <asm/byteorder.h>
 #include <asm/io.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
 #include <asm/sgi/hpc3.h>

diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c
index 8ddf9d02f97338fe43b4cfbfd5c71fa56f884d0c..7bb0e9019d3c8c986a61996a41972badd8b29db5 100644 (file)
--- a/drivers/net/sis900.c
+++ b/drivers/net/sis900.c
@@ -64,9 +64,9 @@
 #include <linux/delay.h>
 #include <linux/ethtool.h>
 #include <linux/crc32.h>
+#include <linux/bitops.h>
 
 #include <asm/processor.h>      /* Processor type for cache alignment. */
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>       /* User space memory access functions */
 

diff --git a/drivers/net/sk98lin/h/skdrv1st.h b/drivers/net/sk98lin/h/skdrv1st.h
index 21d807390738dff4fd2ee7e4c4bad62b62868e35..e65a19f8794ae84386f46293730058e86b43fc8a 100644 (file)
--- a/drivers/net/sk98lin/h/skdrv1st.h
+++ b/drivers/net/sk98lin/h/skdrv1st.h
@@ -66,8 +66,8 @@ typedef struct s_AC   SK_AC;
 #include <linux/slab.h>
 #include <linux/interrupt.h>
 #include <linux/pci.h>
+#include <linux/bitops.h>
 #include <asm/byteorder.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>

diff --git a/drivers/net/sk98lin/skge.c b/drivers/net/sk98lin/skge.c
index 58775e61963d62dfe83e7aae1d7a54a9a71e5485..5db59c43f6a29ecfef5de7139cff8953310d415e 100644 (file)
--- a/drivers/net/sk98lin/skge.c
+++ b/drivers/net/sk98lin/skge.c
@@ -72,8 +72,8 @@
  *             <linux/slab.h>
  *             <linux/interrupt.h>
  *             <linux/pci.h>
+ *             <linux/bitops.h>
  *             <asm/byteorder.h>
- *             <asm/bitops.h>
  *             <asm/io.h>
  *             <linux/netdevice.h>
  *             <linux/etherdevice.h>

diff --git a/drivers/net/sk_g16.c b/drivers/net/sk_g16.c
index bc71b55a99c00a8ea971ffbb93226327b8472044..425012d48f07369051ddb0bbc1cf284dc6750fe1 100644 (file)
--- a/drivers/net/sk_g16.c
+++ b/drivers/net/sk_g16.c
@@ -72,10 +72,10 @@ static const char rcsid[] = "$Id: sk_g16.c,v 1.1 1994/06/30 16:25:15 root Exp $"
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
+#include <linux/bitops.h>
 
 #include <asm/system.h>
 #include <asm/io.h>
-#include <asm/bitops.h> 
 
 #include "sk_g16.h"
 

diff --git a/drivers/net/sk_mca.c b/drivers/net/sk_mca.c
index 2039f22338fc6916525b3d35d3883556f3aa4d3b..07b980281666c5a04f232f86ec61adb136064849 100644 (file)
--- a/drivers/net/sk_mca.c
+++ b/drivers/net/sk_mca.c
@@ -97,9 +97,9 @@ History:
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
+#include <linux/bitops.h>
 
 #include <asm/processor.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 
 #define _SK_MCA_DRIVER_

diff --git a/drivers/net/skfp/skfddi.c b/drivers/net/skfp/skfddi.c
index 8308bcc14ac620bc3e2d2acce6dbe5cd31775fb8..e9ef28cbbd291ef10982b50abfda9ed990dd11a7 100644 (file)
--- a/drivers/net/skfp/skfddi.c
+++ b/drivers/net/skfp/skfddi.c
@@ -83,9 +83,9 @@ static const char *boot_msg =
 #include <linux/netdevice.h>
 #include <linux/fddidevice.h>
 #include <linux/skbuff.h>
+#include <linux/bitops.h>
 
 #include <asm/byteorder.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
 

diff --git a/drivers/net/slip.c b/drivers/net/slip.c
index 0c1995bc284863d282e214611587f756ce8a21b0..01c2c3e1d1027997a7aaa78aec76d85894c64c2e 100644 (file)
--- a/drivers/net/slip.c
+++ b/drivers/net/slip.c
@@ -60,7 +60,7 @@
 
 #include <asm/system.h>
 #include <asm/uaccess.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <linux/string.h>
 #include <linux/mm.h>
 #include <linux/interrupt.h>

diff --git a/drivers/net/smc9194.c b/drivers/net/smc9194.c
index f5071b047315de53c7d174f64cf7ab8a8fe73411..de31ab71384c7e5352bba32ee4e8200a3e74065f 100644 (file)
--- a/drivers/net/smc9194.c
+++ b/drivers/net/smc9194.c
@@ -72,8 +72,8 @@ static const char version[] =
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
+#include <linux/bitops.h>
 
-#include <asm/bitops.h>
 #include <asm/io.h>
 
 #include "smc9194.h"

diff --git a/drivers/net/sun3_82586.c b/drivers/net/sun3_82586.c
index 053fcaf1c9e2f9f372768a32d318c03edca08578..d5a58fb30d3a194772ce3da84b83a3a934100184 100644 (file)
--- a/drivers/net/sun3_82586.c
+++ b/drivers/net/sun3_82586.c
@@ -39,7 +39,7 @@ static int fifo=0x8;  /* don't change */
 #include <linux/interrupt.h>
 #include <linux/delay.h>
 #include <linux/init.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <asm/io.h>
 #include <asm/idprom.h>
 #include <asm/machines.h>

diff --git a/drivers/net/sun3lance.c b/drivers/net/sun3lance.c
index 6faef842db469e47e658d376c2786233c8f63e74..1f43bbfbc1c78af3a95902ed37d602623b1ab292 100644 (file)
--- a/drivers/net/sun3lance.c
+++ b/drivers/net/sun3lance.c
@@ -36,10 +36,10 @@ static char *version = "sun3lance.c: v1.2 1/12/2001  Sam Creasey (sammy@sammy.ne
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
+#include <linux/bitops.h>
 
 #include <asm/setup.h>
 #include <asm/irq.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>
 #include <asm/dvma.h>

diff --git a/drivers/net/sunbmac.c b/drivers/net/sunbmac.c
index 25d35022bdb84b5627236b6471bccd5e7725bf9c..025dcd867eaa7afe90127ccf56ee4a4a3993cae7 100644 (file)
--- a/drivers/net/sunbmac.c
+++ b/drivers/net/sunbmac.c
@@ -22,9 +22,9 @@
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
+#include <linux/bitops.h>
 
 #include <asm/auxio.h>
-#include <asm/bitops.h>
 #include <asm/byteorder.h>
 #include <asm/dma.h>
 #include <asm/idprom.h>

diff --git a/drivers/net/sundance.c b/drivers/net/sundance.c
index 42f66549652462ca0a6bdce4df9250388388c4de..776403daf634ea921b738fa0eee95ee6981f5948 100644 (file)
--- a/drivers/net/sundance.c
+++ b/drivers/net/sundance.c
@@ -162,9 +162,9 @@ static char *media[MAX_UNITS];
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
 #include <linux/init.h>
+#include <linux/bitops.h>
 #include <asm/uaccess.h>
 #include <asm/processor.h>             /* Processor type for cache alignment. */
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <linux/delay.h>
 #include <linux/spinlock.h>

diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c
index eab667c7b1c6208ef295a0fbfb851f3ce02b6d1b..85c1e1e5e89bc4a4cc7e208172e39950213126f2 100644 (file)
--- a/drivers/net/sungem.c
+++ b/drivers/net/sungem.c
@@ -37,9 +37,9 @@
 #include <linux/random.h>
 #include <linux/workqueue.h>
 #include <linux/if_vlan.h>
+#include <linux/bitops.h>
 
 #include <asm/system.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/byteorder.h>
 #include <asm/uaccess.h>

diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c
index 0a11b562780495151ffd15211899b9d645a7b18b..525b9ca619723bcca671a6c9a26c8ae993f40f23 100644 (file)
--- a/drivers/net/sunhme.c
+++ b/drivers/net/sunhme.c
@@ -36,9 +36,9 @@ static char version[] =
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
+#include <linux/bitops.h>
 
 #include <asm/system.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 #include <asm/byteorder.h>

diff --git a/drivers/net/sunlance.c b/drivers/net/sunlance.c
index 6e4bb5781fe9c6820ad44743bf74c419f4de3321..d2d34594bae7c9d6964f990f071383122b5ff227 100644 (file)
--- a/drivers/net/sunlance.c
+++ b/drivers/net/sunlance.c
@@ -94,9 +94,9 @@ static char lancestr[] = "LANCE";
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
 #include <linux/ethtool.h>
+#include <linux/bitops.h>
 
 #include <asm/system.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 #include <asm/pgtable.h>

diff --git a/drivers/net/sunqe.c b/drivers/net/sunqe.c
index 1ed3ff5b3519bb7316b6c4f2fcb03158038babe7..37ef1b82a6cb19b6636e79a733aaec5465615060 100644 (file)
--- a/drivers/net/sunqe.c
+++ b/drivers/net/sunqe.c
@@ -27,9 +27,9 @@ static char version[] =
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
 #include <linux/ethtool.h>
+#include <linux/bitops.h>
 
 #include <asm/system.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 #include <asm/byteorder.h>

diff --git a/drivers/net/tc35815.c b/drivers/net/tc35815.c
index 952ef81775fb843b9c3fd24bc9eec042f95e765f..c2ec9fd8c31d1c3cb3ddbed9cf9167c12c1c4d26 100644 (file)
--- a/drivers/net/tc35815.c
+++ b/drivers/net/tc35815.c
@@ -49,9 +49,9 @@ static const char *version =
 #include <linux/pci.h>
 #include <linux/proc_fs.h>
 #include <linux/spinlock.h>
+#include <linux/bitops.h>
 
 #include <asm/system.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 #include <asm/byteorder.h>

diff --git a/drivers/net/tokenring/3c359.c b/drivers/net/tokenring/3c359.c
index a50df64b212c2004c824e226b405d139c8cfbd74..47d7d6d4ca6455bee263d96abfa90399c2850dfb 100644 (file)
--- a/drivers/net/tokenring/3c359.c
+++ b/drivers/net/tokenring/3c359.c
@@ -61,12 +61,12 @@
 #include <linux/init.h>
 #include <linux/pci.h>
 #include <linux/spinlock.h>
+#include <linux/bitops.h>
 
 #include <net/checksum.h>
 
 #include <asm/io.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
 
 #include "3c359.h"
 

diff --git a/drivers/net/tokenring/lanstreamer.c b/drivers/net/tokenring/lanstreamer.c
index dcf7f3e8ce9301b4a4e830125d37fbb3070c2553..63005ae6a4182f5e1b31f3cdc448bdfcb757dbc3 100644 (file)
--- a/drivers/net/tokenring/lanstreamer.c
+++ b/drivers/net/tokenring/lanstreamer.c
@@ -120,12 +120,12 @@
 #include <linux/pci.h>
 #include <linux/spinlock.h>
 #include <linux/version.h>
+#include <linux/bitops.h>
 
 #include <net/checksum.h>
 
 #include <asm/io.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
 
 #include "lanstreamer.h"
 

diff --git a/drivers/net/tokenring/olympic.c b/drivers/net/tokenring/olympic.c
index 1ec45b2b9f4c37ec21bf0e7f44eccc1a925eb0d8..eed699bafbc84207e2d7aed7d71ffe4c55ab25e7 100644 (file)
--- a/drivers/net/tokenring/olympic.c
+++ b/drivers/net/tokenring/olympic.c
@@ -99,12 +99,12 @@
 #include <linux/init.h>
 #include <linux/pci.h>
 #include <linux/spinlock.h>
+#include <linux/bitops.h>
 
 #include <net/checksum.h>
 
 #include <asm/io.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
 
 #include "olympic.h"
 

diff --git a/drivers/net/tokenring/smctr.c b/drivers/net/tokenring/smctr.c
index 599057ac316fde176788684ae2bca1bb6c87c9da..1331fd1d8f906b1b9d574481fc864eb124d06615 100644 (file)
--- a/drivers/net/tokenring/smctr.c
+++ b/drivers/net/tokenring/smctr.c
@@ -49,9 +49,9 @@
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
 #include <linux/trdevice.h>
+#include <linux/bitops.h>
 
 #include <asm/system.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 #include <asm/irq.h>

diff --git a/drivers/net/tokenring/tms380tr.c b/drivers/net/tokenring/tms380tr.c
index 9d121890b6fba87dc11c5802d0f690f458d9e0d4..df43b449e42924870cfbf97605b3ab72aa1ae900 100644 (file)
--- a/drivers/net/tokenring/tms380tr.c
+++ b/drivers/net/tokenring/tms380tr.c
@@ -96,9 +96,9 @@ static const char version[] = "tms380tr.c: v1.10 30/12/2002 by Christoph Goos, A
 #include <linux/skbuff.h>
 #include <linux/trdevice.h>
 #include <linux/firmware.h>
+#include <linux/bitops.h>
 
 #include <asm/system.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 #include <asm/irq.h>

diff --git a/drivers/net/tulip/de4x5.c b/drivers/net/tulip/de4x5.c
index 05e8947f9047d4ea8eec364682ecae3e238fbb49..7afae1f70483283adcef8146db68cfddabf886d3 100644 (file)
--- a/drivers/net/tulip/de4x5.c
+++ b/drivers/net/tulip/de4x5.c
@@ -467,8 +467,8 @@
 #include <linux/ctype.h>
 #include <linux/dma-mapping.h>
 #include <linux/moduleparam.h>
+#include <linux/bitops.h>
 
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 #include <asm/byteorder.h>

diff --git a/drivers/net/tulip/dmfe.c b/drivers/net/tulip/dmfe.c
index 7353f28ccc34b5c9f60ad7d9b86518abe9c8e681..dfcb1657a0ac7eb3a61fc663bf7e3be60fda8acf 100644 (file)
--- a/drivers/net/tulip/dmfe.c
+++ b/drivers/net/tulip/dmfe.c
@@ -86,9 +86,9 @@
 #include <linux/delay.h>
 #include <linux/spinlock.h>
 #include <linux/crc32.h>
+#include <linux/bitops.h>
 
 #include <asm/processor.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 #include <asm/uaccess.h>

diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c
index 7174a278bddde3e27fdf6d33b8ec688676a40e1a..5bf05492a0ec98195953b156afa8c8042a193574 100644 (file)
--- a/drivers/net/tulip/winbond-840.c
+++ b/drivers/net/tulip/winbond-840.c
@@ -130,9 +130,9 @@ static int full_duplex[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1};
 #include <linux/mii.h>
 #include <linux/rtnetlink.h>
 #include <linux/crc32.h>
+#include <linux/bitops.h>
 #include <asm/uaccess.h>
 #include <asm/processor.h>             /* Processor type for cache alignment. */
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 

diff --git a/drivers/net/tulip/xircom_cb.c b/drivers/net/tulip/xircom_cb.c
index 6e65890391a64893433eaa370b2739f6c0e287d1..1555d632266d017463f544e5d4ac64595a3ae1d4 100644 (file)
--- a/drivers/net/tulip/xircom_cb.c
+++ b/drivers/net/tulip/xircom_cb.c
@@ -28,9 +28,9 @@
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/ethtool.h>
+#include <linux/bitops.h>
 
 #include <asm/uaccess.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 
 #ifdef DEBUG

diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c
index d22567ede9742704124f0463285fe913a3097deb..d763bf6d310f284fe4308d628238626c684bd111 100644 (file)
--- a/drivers/net/typhoon.c
+++ b/drivers/net/typhoon.c
@@ -115,8 +115,8 @@ static const int multicast_filter_limit = 32;
 #include <linux/ethtool.h>
 #include <linux/if_vlan.h>
 #include <linux/crc32.h>
+#include <linux/bitops.h>
 #include <asm/processor.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
 #include <linux/in6.h>

diff --git a/drivers/net/via-rhine.c b/drivers/net/via-rhine.c
index 33c3137c016eaaa07bc53f3038d6df33146a054c..5a011ee958b9582269882988807bd842c7d371e5 100644 (file)
--- a/drivers/net/via-rhine.c
+++ b/drivers/net/via-rhine.c
@@ -193,8 +193,8 @@ static const int multicast_filter_limit = 32;
 #include <linux/mii.h>
 #include <linux/ethtool.h>
 #include <linux/crc32.h>
+#include <linux/bitops.h>
 #include <asm/processor.h>     /* Processor type for cache alignment. */
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/uaccess.h>

diff --git a/drivers/net/wan/dlci.c b/drivers/net/wan/dlci.c
index bad0d418580be6aa5bf4e1833f262dafa66ca90f..6e1ec5bf22fc702cd1b32895149ca109d666373f 100644 (file)
--- a/drivers/net/wan/dlci.c
+++ b/drivers/net/wan/dlci.c
@@ -45,11 +45,11 @@
 #include <linux/skbuff.h>
 #include <linux/if_arp.h>
 #include <linux/if_frad.h>
+#include <linux/bitops.h>
 
 #include <net/sock.h>
 
 #include <asm/system.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 #include <asm/uaccess.h>

diff --git a/drivers/net/wan/hd6457x.c b/drivers/net/wan/hd6457x.c
index c98d7eca5c92b3617360b23bd8a19caac7a929ee..c96f5aaf4529bf83e80105f80d2791a60687e75f 100644 (file)
--- a/drivers/net/wan/hd6457x.c
+++ b/drivers/net/wan/hd6457x.c
@@ -38,9 +38,9 @@
 #include <linux/errno.h>
 #include <linux/init.h>
 #include <linux/ioport.h>
+#include <linux/bitops.h>
 
 #include <asm/system.h>
-#include <asm/bitops.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
 

diff --git a/drivers/net/wan/lmc/lmc_main.c b/drivers/net/wan/lmc/lmc_main.c
index b9800715d73978007499e59edc7c3fadd27e4412..f88d9b64eafa91b82e6108854620b91d641295cc 100644 (file)
--- a/drivers/net/wan/lmc/lmc_main.c
+++ b/drivers/net/wan/lmc/lmc_main.c
@@ -56,11 +56,11 @@
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
 #include <linux/inet.h>
+#include <linux/bitops.h>
 
 #include <net/syncppp.h>
 
 #include <asm/processor.h>             /* Processor type for cache alignment. */
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 #include <asm/uaccess.h>

diff --git a/drivers/net/wan/lmc/lmc_media.c b/drivers/net/wan/lmc/lmc_media.c
index 2aca8dc986f1629ce0836369a1e52aba302575b3..f55ce76b00edd4545fe826f6844b338acd1cc46d 100644 (file)
--- a/drivers/net/wan/lmc/lmc_media.c
+++ b/drivers/net/wan/lmc/lmc_media.c
@@ -16,11 +16,11 @@
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
 #include <linux/inet.h>
+#include <linux/bitops.h>
 
 #include <net/syncppp.h>
 
 #include <asm/processor.h>             /* Processor type for cache alignment. */
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 

diff --git a/drivers/net/wan/lmc/lmc_proto.c b/drivers/net/wan/lmc/lmc_proto.c
index bb9f1eab7cdbf1829b448e277955e3ad24c53b2b..74876c0073e8c8a5ad1a97c47b1518db8d81ba0e 100644 (file)
--- a/drivers/net/wan/lmc/lmc_proto.c
+++ b/drivers/net/wan/lmc/lmc_proto.c
@@ -36,11 +36,11 @@
 #include <linux/inet.h>
 #include <linux/workqueue.h>
 #include <linux/proc_fs.h>
+#include <linux/bitops.h>
 
 #include <net/syncppp.h>
 
 #include <asm/processor.h>             /* Processor type for cache alignment. */
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 #include <linux/smp.h>

diff --git a/drivers/net/wan/sdla.c b/drivers/net/wan/sdla.c
index 12598181abed54f3dcdacbac4cb3ac340dc515c9..f0ed00ef06fee1ccc519d96f58eef2f34c1d4ce2 100644 (file)
--- a/drivers/net/wan/sdla.c
+++ b/drivers/net/wan/sdla.c
@@ -51,9 +51,9 @@
 #include <linux/if_arp.h>
 #include <linux/if_frad.h>
 #include <linux/sdla.h>
+#include <linux/bitops.h>
 
 #include <asm/system.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 #include <asm/uaccess.h>

diff --git a/drivers/net/wan/x25_asy.c b/drivers/net/wan/x25_asy.c
index 467ad7b8cd8675fede848d0d3f5601cbbb6c2156..c29233115d3f87754c490f5b9434eb7164215f91 100644 (file)
--- a/drivers/net/wan/x25_asy.c
+++ b/drivers/net/wan/x25_asy.c
@@ -18,7 +18,7 @@
 
 #include <asm/system.h>
 #include <asm/uaccess.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <linux/string.h>
 #include <linux/mm.h>
 #include <linux/interrupt.h>

diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index 4246f6b8b6563fc61662b08f98a3d008beada7c9..0360693eb6fc9ae80cf1479dc72a26d8f0b4180b 100644 (file)
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -35,9 +35,9 @@
 #include <linux/interrupt.h>
 #include <linux/suspend.h>
 #include <linux/in.h>
+#include <linux/bitops.h>
 #include <asm/io.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
 
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>

diff --git a/drivers/net/wireless/arlan.h b/drivers/net/wireless/arlan.h
index a48af699c9c5630d976b2ad66ecfbd9bb08f44ef..e499f4b52a5148f2dbd79296a1862a326b039fc2 100644 (file)
--- a/drivers/net/wireless/arlan.h
+++ b/drivers/net/wireless/arlan.h
@@ -19,8 +19,8 @@
 #include <linux/timer.h>
 
 #include <linux/init.h>
+#include <linux/bitops.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <linux/errno.h>
 #include <linux/delay.h>

diff --git a/drivers/net/wireless/netwave_cs.c b/drivers/net/wireless/netwave_cs.c
index 13641142bf77241ceed731e33babfb763135c3c9..15708eb78521d682b1df559177f18f206089673a 100644 (file)
--- a/drivers/net/wireless/netwave_cs.c
+++ b/drivers/net/wireless/netwave_cs.c
@@ -54,6 +54,7 @@
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
+#include <linux/bitops.h>
 #ifdef CONFIG_NET_RADIO
 #include <linux/wireless.h>
 #if WIRELESS_EXT > 12
@@ -70,7 +71,6 @@
 #include <pcmcia/mem_op.h>
 
 #include <asm/system.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 

diff --git a/drivers/net/wireless/strip.c b/drivers/net/wireless/strip.c
index 7f44588cb6e7576006477315b911fc8cdd688bc2..69c92876f7fd5cc01081ab81cc30aee1be89a7f7 100644 (file)
--- a/drivers/net/wireless/strip.c
+++ b/drivers/net/wireless/strip.c
@@ -85,9 +85,9 @@ static const char StripVersion[] = "1.3A-STUART.CHESHIRE";
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
+#include <linux/bitops.h>
 #include <asm/system.h>
 #include <asm/uaccess.h>
-#include <asm/bitops.h>
 
 # include <linux/ctype.h>
 #include <linux/string.h>

diff --git a/drivers/net/wireless/wavelan.p.h b/drivers/net/wireless/wavelan.p.h
index 24e66a8c2de13de2a0519cf15aa5755fcc97e0d4..475add67f5bf7e0954d984cb9bd81c2833f3acc9 100644 (file)
--- a/drivers/net/wireless/wavelan.p.h
+++ b/drivers/net/wireless/wavelan.p.h
@@ -377,8 +377,8 @@
 #include       <linux/in.h>
 #include       <linux/string.h>
 #include       <linux/delay.h>
+#include       <linux/bitops.h>
 #include       <asm/system.h>
-#include       <asm/bitops.h>
 #include       <asm/io.h>
 #include       <asm/dma.h>
 #include       <asm/uaccess.h>

diff --git a/drivers/net/wireless/wavelan_cs.p.h b/drivers/net/wireless/wavelan_cs.p.h
index 381876f542a779c6c82b1a28be3f47e3d1591f86..0c18af2624946c4b75dc5e589225ab03cf67bab3 100644 (file)
--- a/drivers/net/wireless/wavelan_cs.p.h
+++ b/drivers/net/wireless/wavelan_cs.p.h
@@ -428,10 +428,10 @@
 #include <linux/spinlock.h>
 #include <linux/in.h>
 #include <linux/delay.h>
+#include <linux/bitops.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
 
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>

diff --git a/drivers/net/yellowfin.c b/drivers/net/yellowfin.c
index 53fb0e88235c3600748d7e2383d0bbe8f5d8f208..9c2d0752ab904ff1852310e76c37e704c7f7a7ea 100644 (file)
--- a/drivers/net/yellowfin.c
+++ b/drivers/net/yellowfin.c
@@ -124,10 +124,10 @@ static int gx_fix;
 #include <linux/skbuff.h>
 #include <linux/ethtool.h>
 #include <linux/crc32.h>
+#include <linux/bitops.h>
 #include <asm/uaccess.h>
 #include <asm/processor.h>             /* Processor type for cache alignment. */
 #include <asm/unaligned.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 
 /* These identify the driver base version and may not be removed. */

diff --git a/drivers/net/znet.c b/drivers/net/znet.c
index 9ebd5ea34b881f86cd9b69377f09db5bb736d6cc..d26121fa61df920e3492c6f1f1b3201de5a0eb58 100644 (file)
--- a/drivers/net/znet.c
+++ b/drivers/net/znet.c
@@ -98,9 +98,9 @@
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
 #include <linux/if_arp.h>
+#include <linux/bitops.h>
 
 #include <asm/system.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 

diff --git a/drivers/pcmcia/i82365.c b/drivers/pcmcia/i82365.c
index fd404eee5c6ff27a0c5e9b641f4cf5529659d11c..56ced25d993c62575f0e6209e7d995a21e1304d4 100644 (file)
--- a/drivers/pcmcia/i82365.c
+++ b/drivers/pcmcia/i82365.c
@@ -48,9 +48,9 @@
 #include <linux/workqueue.h>
 #include <linux/interrupt.h>
 #include <linux/device.h>
+#include <linux/bitops.h>
 #include <asm/irq.h>
 #include <asm/io.h>
-#include <asm/bitops.h>
 #include <asm/system.h>
 
 #include <pcmcia/version.h>

diff --git a/drivers/pcmcia/tcic.c b/drivers/pcmcia/tcic.c
index 0bb9017d0b77eb02e922b919197760415782c30c..a651309eb84fb81db366f1211e3f3058b8898145 100644 (file)
--- a/drivers/pcmcia/tcic.c
+++ b/drivers/pcmcia/tcic.c
@@ -45,9 +45,9 @@
 #include <linux/delay.h>
 #include <linux/workqueue.h>
 #include <linux/device.h>
+#include <linux/bitops.h>
 
 #include <asm/io.h>
-#include <asm/bitops.h>
 #include <asm/system.h>
 
 #include <pcmcia/version.h>

diff --git a/drivers/s390/net/ctcmain.c b/drivers/s390/net/ctcmain.c
index 6a1cb3f86be9e49561fb7ef879bb12b94402c2bb..ba0348a5fe06a7013f2c72c2560cb0045d1f86e6 100644 (file)
--- a/drivers/s390/net/ctcmain.c
+++ b/drivers/s390/net/ctcmain.c
@@ -51,6 +51,7 @@
 #include <linux/interrupt.h>
 #include <linux/timer.h>
 #include <linux/sched.h>
+#include <linux/bitops.h>
 
 #include <linux/signal.h>
 #include <linux/string.h>
@@ -65,7 +66,6 @@
 #include <asm/io.h>
 #include <asm/ccwdev.h>
 #include <asm/ccwgroup.h>
-#include <asm/bitops.h>
 #include <asm/uaccess.h>
 
 #include <asm/idals.h>

diff --git a/drivers/s390/net/netiucv.c b/drivers/s390/net/netiucv.c
index e95272f1a03ea99334303ee09a9e8ee84f343bd6..16e8e69afb10b2d3395657bb2a0db1f4b298b05f 100644 (file)
--- a/drivers/s390/net/netiucv.c
+++ b/drivers/s390/net/netiucv.c
@@ -45,6 +45,7 @@
 #include <linux/interrupt.h>
 #include <linux/timer.h>
 #include <linux/sched.h>
+#include <linux/bitops.h>
 
 #include <linux/signal.h>
 #include <linux/string.h>
@@ -58,7 +59,6 @@
 #include <net/dst.h>
 
 #include <asm/io.h>
-#include <asm/bitops.h>
 #include <asm/uaccess.h>
 
 #include "iucv.h"

diff --git a/drivers/s390/net/qeth.h b/drivers/s390/net/qeth.h
index 063430d3f2bc58073348586505a28301a9418142..56f0923c3219090d297f495bc1dee542a7709898 100644 (file)
--- a/drivers/s390/net/qeth.h
+++ b/drivers/s390/net/qeth.h
@@ -15,7 +15,8 @@
 #include <net/addrconf.h>
 
 
-#include <asm/bitops.h>
+#include <linux/bitops.h>
+
 #include <asm/debug.h>
 #include <asm/qdio.h>
 #include <asm/ccwdev.h>

diff --git a/drivers/sbus/char/aurora.c b/drivers/sbus/char/aurora.c
index 1ff81bec87417b006ba1f3682b56762df88ac37d..db4c1c2b799cf8430a7783b0a8b456c3ff1b95f6 100644 (file)
--- a/drivers/sbus/char/aurora.c
+++ b/drivers/sbus/char/aurora.c
@@ -60,12 +60,12 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/delay.h>
+#include <linux/bitops.h>
 
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/oplib.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
 #include <asm/kdebug.h>
 #include <asm/sbus.h>
 #include <asm/uaccess.h>

diff --git a/drivers/scsi/NCR53c406a.c b/drivers/scsi/NCR53c406a.c
index c407e8643bab458766662584f3dd4c77bd22e0fd..c685d546f8381e68a8e99a348e5d054caf6c472c 100644 (file)
--- a/drivers/scsi/NCR53c406a.c
+++ b/drivers/scsi/NCR53c406a.c
@@ -46,9 +46,9 @@
 #include <linux/proc_fs.h>
 #include <linux/stat.h>
 #include <linux/init.h>
+#include <linux/bitops.h>
 #include <asm/io.h>
 #include <asm/dma.h>
-#include <asm/bitops.h>
 #include <asm/irq.h>
 
 #include <linux/blkdev.h>

diff --git a/drivers/scsi/arm/acornscsi.c b/drivers/scsi/arm/acornscsi.c
index e5e86962f0d1073166762c0ec535b3cf49f54a97..24dd0b890dd2069d38db05ff778b6e9990836de9 100644 (file)
--- a/drivers/scsi/arm/acornscsi.c
+++ b/drivers/scsi/arm/acornscsi.c
@@ -142,8 +142,8 @@
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include <linux/init.h>
+#include <linux/bitops.h>
 
-#include <asm/bitops.h>
 #include <asm/system.h>
 #include <asm/io.h>
 #include <asm/irq.h>

diff --git a/drivers/scsi/atari_scsi.c b/drivers/scsi/atari_scsi.c
index c3d8bc82eb74657910d16b3478cd739d8b2c84f9..af8adb629b33eba5cbbbb99e000b81710c3731c0 100644 (file)
--- a/drivers/scsi/atari_scsi.c
+++ b/drivers/scsi/atari_scsi.c
@@ -91,6 +91,7 @@
 #include <linux/interrupt.h>
 #include <linux/init.h>
 #include <linux/nvram.h>
+#include <linux/bitops.h>
 
 #include <asm/setup.h>
 #include <asm/atarihw.h>
@@ -99,7 +100,6 @@
 #include <asm/pgtable.h>
 #include <asm/irq.h>
 #include <asm/traps.h>
-#include <asm/bitops.h>
 
 #include "scsi.h"
 #include <scsi/scsi_host.h>

diff --git a/drivers/scsi/ultrastor.c b/drivers/scsi/ultrastor.c
index cb0a05d5672272b235684f686eb763ae515d6d7f..3d0a0f2f7f89da12ee3894b4b51f90cf96d309f5 100644 (file)
--- a/drivers/scsi/ultrastor.c
+++ b/drivers/scsi/ultrastor.c
@@ -137,9 +137,9 @@
 #include <linux/proc_fs.h>
 #include <linux/spinlock.h>
 #include <linux/stat.h>
+#include <linux/bitops.h>
 
 #include <asm/io.h>
-#include <asm/bitops.h>
 #include <asm/system.h>
 #include <asm/dma.h>
 

diff --git a/drivers/serial/68328serial.c b/drivers/serial/68328serial.c
index 6dd522466d34fc2158d6d9bcd4ac2fa22f7fcef1..299c2bcea221c95542f50fcdb81086fbd5172b07 100644 (file)
--- a/drivers/serial/68328serial.c
+++ b/drivers/serial/68328serial.c
@@ -34,12 +34,12 @@
 #include <linux/keyboard.h>
 #include <linux/init.h>
 #include <linux/pm.h>
+#include <linux/bitops.h>
 
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/system.h>
 #include <asm/segment.h>
-#include <asm/bitops.h>
 #include <asm/delay.h>
 #include <asm/uaccess.h>
 

diff --git a/drivers/serial/8250_pci.c b/drivers/serial/8250_pci.c
index 2d69c47e61dbe958ffbd00a33eb738fd41de1f32..ef536ae168614a8c33482e84c9cffac1d530c20e 100644 (file)
--- a/drivers/serial/8250_pci.c
+++ b/drivers/serial/8250_pci.c
@@ -24,8 +24,8 @@
 #include <linux/tty.h>
 #include <linux/serial_core.h>
 #include <linux/8250_pci.h>
+#include <linux/bitops.h>
 
-#include <asm/bitops.h>
 #include <asm/byteorder.h>
 #include <asm/io.h>
 

diff --git a/drivers/serial/8250_pnp.c b/drivers/serial/8250_pnp.c
index efa91660adcdf1c03774c68b9d7ac9368c055818..5c8f1fbd504016890826e0309c13e633a881d97c 100644 (file)
--- a/drivers/serial/8250_pnp.c
+++ b/drivers/serial/8250_pnp.c
@@ -25,8 +25,8 @@
 #include <linux/serial.h>
 #include <linux/serialP.h>
 #include <linux/serial_core.h>
+#include <linux/bitops.h>
 
-#include <asm/bitops.h>
 #include <asm/byteorder.h>
 #include <asm/serial.h>
 

diff --git a/drivers/serial/icom.c b/drivers/serial/icom.c
index c15c8a0aac58a985a8c252481099be9539a64ae8..df71e2370f97ed9ba241478c2022843976897c88 100644 (file)
--- a/drivers/serial/icom.c
+++ b/drivers/serial/icom.c
@@ -54,13 +54,13 @@
 #include <linux/spinlock.h>
 #include <linux/kobject.h>
 #include <linux/firmware.h>
+#include <linux/bitops.h>
 
 #include <asm/system.h>
 #include <asm/segment.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/uaccess.h>
-#include <asm/bitops.h>
 
 #include "icom.h"
 

diff --git a/drivers/serial/mcfserial.c b/drivers/serial/mcfserial.c
index 7f1b9ee7e03fe4240c7101cbf4607858f294d199..46bcd19f2c45420a08f924ed38a55f5cf2a24679 100644 (file)
--- a/drivers/serial/mcfserial.c
+++ b/drivers/serial/mcfserial.c
@@ -34,13 +34,13 @@
 #include <linux/serialP.h>
 #include <linux/console.h>
 #include <linux/init.h>
+#include <linux/bitops.h>
 
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/system.h>
 #include <asm/segment.h>
 #include <asm/semaphore.h>
-#include <asm/bitops.h>
 #include <asm/delay.h>
 #include <asm/coldfire.h>
 #include <asm/mcfsim.h>

diff --git a/drivers/serial/pmac_zilog.c b/drivers/serial/pmac_zilog.c
index 72586594be4c1ea6de7e35250a41145711208045..bda0c8088fac55a8106029881fd2a862ddf7c233 100644 (file)
--- a/drivers/serial/pmac_zilog.c
+++ b/drivers/serial/pmac_zilog.c
@@ -53,11 +53,11 @@
 #include <linux/slab.h>
 #include <linux/adb.h>
 #include <linux/pmu.h>
+#include <linux/bitops.h>
 #include <asm/sections.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/prom.h>
-#include <asm/bitops.h>
 #include <asm/machdep.h>
 #include <asm/pmac_feature.h>
 #include <asm/dbdma.h>

diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c
index b44e820a6d8b007487be1115f59cb3c8b1a48086..ad5b776d779b3ca56a8db712ddd89defefe2dbce 100644 (file)
--- a/drivers/serial/sh-sci.c
+++ b/drivers/serial/sh-sci.c
@@ -41,6 +41,7 @@
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/console.h>
+#include <linux/bitops.h>
 
 #ifdef CONFIG_CPU_FREQ
 #include <linux/notifier.h>
@@ -51,7 +52,6 @@
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/uaccess.h>
-#include <asm/bitops.h>
 
 #include <linux/generic_serial.h>
 

diff --git a/drivers/tc/zs.c b/drivers/tc/zs.c
index c5befc9af125e518f4c1487d87e46e62cb2c7ff6..74aea012129c5de4a08d71d39559fec63ede622d 100644 (file)
--- a/drivers/tc/zs.c
+++ b/drivers/tc/zs.c
@@ -55,6 +55,7 @@
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/ioport.h>
+#include <linux/bitops.h>
 #ifdef CONFIG_SERIAL_CONSOLE
 #include <linux/console.h>
 #endif
@@ -63,7 +64,6 @@
 #include <asm/pgtable.h>
 #include <asm/irq.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
 #include <asm/uaccess.h>
 #include <asm/wbflush.h>
 #include <asm/bootinfo.h>

diff --git a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c
index 95dce59958592a59e92851edefec743d93d14139..b9f57d391a34495b6a65a38d7af174a7a91147a2 100644 (file)
--- a/drivers/usb/host/uhci-hcd.c
+++ b/drivers/usb/host/uhci-hcd.c
@@ -51,8 +51,8 @@
 #include <linux/dmapool.h>
 #include <linux/dma-mapping.h>
 #include <linux/usb.h>
+#include <linux/bitops.h>
 
-#include <asm/bitops.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
 #include <asm/irq.h>

diff --git a/drivers/usb/net/catc.c b/drivers/usb/net/catc.c
index 920fbd6608e5cf4819ee08fda360636c01d97912..decd7ab1c7fe9787bda2c8d7a38fdd8b1238782d 100644 (file)
--- a/drivers/usb/net/catc.c
+++ b/drivers/usb/net/catc.c
@@ -43,7 +43,7 @@
 #include <linux/spinlock.h>
 #include <linux/ethtool.h>
 #include <linux/crc32.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <asm/uaccess.h>
 
 #undef DEBUG

diff --git a/drivers/zorro/zorro.c b/drivers/zorro/zorro.c
index c10bc4bcd3833bc6e81e8d8b9674b480537b3ba3..6d70b40d3fa585da8c3b04a5e5446a50f85604a4 100644 (file)
--- a/drivers/zorro/zorro.c
+++ b/drivers/zorro/zorro.c
@@ -15,8 +15,8 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/zorro.h>
+#include <linux/bitops.h>
 #include <asm/setup.h>
-#include <asm/bitops.h>
 #include <asm/amigahw.h>
 
 #include "zorro.h"

diff --git a/fs/adfs/super.c b/fs/adfs/super.c
index 87e8694509f7bad10cd97dc1758e60e6503f4a16..243963228d10e98572fa8d7de34effc412bc0129 100644 (file)
--- a/fs/adfs/super.c
+++ b/fs/adfs/super.c
@@ -19,8 +19,8 @@
 #include <linux/buffer_head.h>
 #include <linux/vfs.h>
 #include <linux/parser.h>
+#include <linux/bitops.h>
 
-#include <asm/bitops.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
 

diff --git a/fs/autofs/inode.c b/fs/autofs/inode.c
index a50096dd1595ef6501501d395395a93bdc53fe1a..579e432794a8ae5adc11889371e343074b10b7e1 100644 (file)
--- a/fs/autofs/inode.c
+++ b/fs/autofs/inode.c
@@ -15,7 +15,7 @@
 #include <linux/slab.h>
 #include <linux/file.h>
 #include <linux/parser.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include "autofs_i.h"
 #include <linux/module.h>
 

diff --git a/fs/autofs4/inode.c b/fs/autofs4/inode.c
index 3b8e34a7aeb1385f689132b20fba34a1046322f6..72f579c47ca8d59caa7d6e332dd3c061786eb594 100644 (file)
--- a/fs/autofs4/inode.c
+++ b/fs/autofs4/inode.c
@@ -15,7 +15,7 @@
 #include <linux/file.h>
 #include <linux/pagemap.h>
 #include <linux/parser.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include "autofs_i.h"
 #include <linux/module.h>
 

diff --git a/fs/buffer.c b/fs/buffer.c
index 2a75b3f9efe4fa36c0843f5ab48a1bc409cc6c17..d4027fca46bc0966fcf9559f465fb4e94f72422d 100644 (file)
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -38,7 +38,7 @@
 #include <linux/bio.h>
 #include <linux/notifier.h>
 #include <linux/cpu.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 
 static int fsync_buffers_list(spinlock_t *lock, struct list_head *list);
 static void invalidate_bh_lrus(void);

diff --git a/fs/coda/sysctl.c b/fs/coda/sysctl.c
index fd98626ba280cbfc84f5eb089746dd157e78da02..5b71f47e27dd4909de1b7d97ef987f02bd007913 100644 (file)
--- a/fs/coda/sysctl.c
+++ b/fs/coda/sysctl.c
@@ -19,7 +19,7 @@
 #include <linux/slab.h>
 #include <linux/stat.h>
 #include <linux/ctype.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <asm/uaccess.h>
 #include <linux/utsname.h>
 #include <linux/module.h>

diff --git a/fs/devfs/base.c b/fs/devfs/base.c
index 65e299a2d97ef51a332cf6999c2e6692f1b477c8..22e3cf0852aac6def5295d939cee9bec2f68bd37 100644 (file)
--- a/fs/devfs/base.c
+++ b/fs/devfs/base.c
@@ -677,13 +677,13 @@
 #include <linux/rwsem.h>
 #include <linux/sched.h>
 #include <linux/namei.h>
+#include <linux/bitops.h>
 
 #include <asm/uaccess.h>
 #include <asm/io.h>
 #include <asm/processor.h>
 #include <asm/system.h>
 #include <asm/pgtable.h>
-#include <asm/bitops.h>
 #include <asm/atomic.h>
 
 #define DEVFS_VERSION            "2004-01-31"

diff --git a/fs/devfs/util.c b/fs/devfs/util.c
index 06a2d827e3e50968375c7326c1070f92fec2b5f4..db06d388c9ac63388e1ff88aa7e6f32181112bba 100644 (file)
--- a/fs/devfs/util.c
+++ b/fs/devfs/util.c
@@ -71,7 +71,7 @@
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/genhd.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 
 int devfs_register_tape(const char *name)
 {

diff --git a/fs/eventpoll.c b/fs/eventpoll.c
index 7d6a12f66a6fc06dcc57961d165ff5869dd04154..b11ab1a9ceeed9f5ea9f1ac39d2d1fd475661872 100644 (file)
--- a/fs/eventpoll.c
+++ b/fs/eventpoll.c
@@ -33,7 +33,7 @@
 #include <linux/wait.h>
 #include <linux/eventpoll.h>
 #include <linux/mount.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
 #include <asm/io.h>

diff --git a/fs/ext3/ialloc.c b/fs/ext3/ialloc.c
index a3ca0238635a60ad08f6b2d135683d6319232188..e6bcf5fac48d54d3d8b2926c236b71a820b3e427 100644 (file)
--- a/fs/ext3/ialloc.c
+++ b/fs/ext3/ialloc.c
@@ -22,8 +22,8 @@
 #include <linux/quotaops.h>
 #include <linux/buffer_head.h>
 #include <linux/random.h>
+#include <linux/bitops.h>
 
-#include <asm/bitops.h>
 #include <asm/byteorder.h>
 
 #include "xattr.h"

diff --git a/fs/file.c b/fs/file.c
index d40c4028fab2e437e543510dfde5e43665588ce1..862a89c3dffe9efa509e3e622cb5c6f728849708 100644 (file)
--- a/fs/file.c
+++ b/fs/file.c
@@ -12,8 +12,7 @@
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/file.h>
-
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 
 
 /*

diff --git a/fs/jfs/jfs_incore.h b/fs/jfs/jfs_incore.h
index 5496bfb149cf20efdb4c04d6e03e68e8a0e78414..2357d95c2a902c446dc7d181710d2afb06f18b93 100644 (file)
--- a/fs/jfs/jfs_incore.h
+++ b/fs/jfs/jfs_incore.h
@@ -21,7 +21,7 @@
 
 #include <linux/rwsem.h>
 #include <linux/slab.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include "jfs_types.h"
 #include "jfs_xtree.h"
 #include "jfs_dtree.h"

diff --git a/fs/minix/bitmap.c b/fs/minix/bitmap.c
index daae633cc43d80c7c96a319cbe333f678287573a..4a4a743269595cc33761291c3f919f59760fc7f9 100644 (file)
--- a/fs/minix/bitmap.c
+++ b/fs/minix/bitmap.c
@@ -14,7 +14,7 @@
 #include "minix.h"
 #include <linux/smp_lock.h>
 #include <linux/buffer_head.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 
 static int nibblemap[] = { 4,3,3,2,3,2,2,1,3,2,2,1,2,1,1,0 };
 

diff --git a/fs/partitions/devfs.c b/fs/partitions/devfs.c
index 9b4d03742c87834f71dfe93769ab55e5adcdceda..87f50444fd3932bcfe93550e51ac3f8ba265d52a 100644 (file)
--- a/fs/partitions/devfs.c
+++ b/fs/partitions/devfs.c
@@ -5,7 +5,7 @@
 #include <linux/devfs_fs_kernel.h>
 #include <linux/vmalloc.h>
 #include <linux/genhd.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <asm/semaphore.h>
 
 

diff --git a/fs/proc/generic.c b/fs/proc/generic.c
index 72febc00fa3bf27d35c016251bf73b9adfc19b91..e0e72ec5b978d0f8ab197557d1efc5c067f38880 100644 (file)
--- a/fs/proc/generic.c
+++ b/fs/proc/generic.c
@@ -18,8 +18,8 @@
 #include <linux/init.h>
 #include <linux/idr.h>
 #include <linux/namei.h>
+#include <linux/bitops.h>
 #include <asm/uaccess.h>
-#include <asm/bitops.h>
 
 static ssize_t proc_file_read(struct file *file, char __user *buf,
                              size_t nbytes, loff_t *ppos);

diff --git a/fs/proc/proc_tty.c b/fs/proc/proc_tty.c
index 93cbcbaf6f0c445b42b56eab82120226cc3e9f08..e4e2f6b5e9c1d6769c01a30d926792e5f6ee3318 100644 (file)
--- a/fs/proc/proc_tty.c
+++ b/fs/proc/proc_tty.c
@@ -13,7 +13,7 @@
 #include <linux/stat.h>
 #include <linux/tty.h>
 #include <linux/seq_file.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 
 static int tty_ldiscs_read_proc(char *page, char **start, off_t off,
                                int count, int *eof, void *data);

diff --git a/fs/proc/root.c b/fs/proc/root.c
index 76779d4e5a7564c4bb0315cc022bfd46630868ea..aef148f099a2892a2826f45ef5182feed2eb327b 100644 (file)
--- a/fs/proc/root.c
+++ b/fs/proc/root.c
@@ -15,7 +15,7 @@
 #include <linux/config.h>
 #include <linux/init.h>
 #include <linux/module.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <linux/smp_lock.h>
 
 struct proc_dir_entry *proc_net, *proc_net_stat, *proc_bus, *proc_root_fs, *proc_root_driver;

diff --git a/fs/qnx4/bitmap.c b/fs/qnx4/bitmap.c
index 72327856f893dbbc3420b1849b5f58c746814251..ea634dc47b92b079c46e84321576db4ef12a2e65 100644 (file)
--- a/fs/qnx4/bitmap.c
+++ b/fs/qnx4/bitmap.c
@@ -21,8 +21,7 @@
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/buffer_head.h>
-
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 
 int qnx4_new_block(struct super_block *sb)
 {

diff --git a/fs/udf/balloc.c b/fs/udf/balloc.c
index 235418f35f65391d48aecb50ed70f4faeaaffc9e..cddb733d20fb41cb9bc5cec2e9ccd72be2b4d55a 100644 (file)
--- a/fs/udf/balloc.c
+++ b/fs/udf/balloc.c
@@ -28,7 +28,7 @@
 
 #include <linux/quotaops.h>
 #include <linux/buffer_head.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 
 #include "udf_i.h"
 #include "udf_sb.h"

diff --git a/fs/ufs/balloc.c b/fs/ufs/balloc.c
index 9195c9dfa8030757f922cfebf028ea7cd06284fd..997640c99c7d88030d2de6e980deee138a18db0e 100644 (file)
--- a/fs/ufs/balloc.c
+++ b/fs/ufs/balloc.c
@@ -14,7 +14,7 @@
 #include <linux/quotaops.h>
 #include <linux/buffer_head.h>
 #include <linux/sched.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <asm/byteorder.h>
 
 #include "swab.h"

diff --git a/fs/ufs/cylinder.c b/fs/ufs/cylinder.c
index 105a695aad8fb12c100691aa570fc774633eed03..14abb8b835f77953854477d489035cbf86294700 100644 (file)
--- a/fs/ufs/cylinder.c
+++ b/fs/ufs/cylinder.c
@@ -13,8 +13,8 @@
 #include <linux/time.h>
 #include <linux/stat.h>
 #include <linux/string.h>
+#include <linux/bitops.h>
 
-#include <asm/bitops.h>
 #include <asm/byteorder.h>
 
 #include "swab.h"

diff --git a/fs/ufs/ialloc.c b/fs/ufs/ialloc.c
index 767cb8fbbebf45382936f956597fa89cbb35a2dd..ed6e546fc4fba7bb1fe0261564e1a78a14a6065a 100644 (file)
--- a/fs/ufs/ialloc.c
+++ b/fs/ufs/ialloc.c
@@ -28,7 +28,7 @@
 #include <linux/quotaops.h>
 #include <linux/buffer_head.h>
 #include <linux/sched.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <asm/byteorder.h>
 
 #include "swab.h"

diff --git a/fs/ufs/super.c b/fs/ufs/super.c
index 4ff38a0ab44a5b385d2ecf86db966360b611498c..7bcd4fc8d651956341e6c286ba97a7ae8c7a8b8e 100644 (file)
--- a/fs/ufs/super.c
+++ b/fs/ufs/super.c
@@ -66,10 +66,10 @@
 
 #include <linux/config.h>
 #include <linux/module.h>
+#include <linux/bitops.h>
 
 #include <stdarg.h>
 
-#include <asm/bitops.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
 

diff --git a/include/linux/idr.h b/include/linux/idr.h
index 1b0c1e6d1e2da7c2a3d2525d38b5b956a2790b34..ca3b7e4625769d1333e9d882bab88ff404b96c5d 100644 (file)
--- a/include/linux/idr.h
+++ b/include/linux/idr.h
@@ -9,7 +9,7 @@
  * tables.
  */
 #include <linux/types.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 
 #if BITS_PER_LONG == 32
 # define IDR_BITS 5

diff --git a/include/linux/mtd/gen_probe.h b/include/linux/mtd/gen_probe.h
index 2d66b33f805d0d1df51c396b102231ad79853e02..f6208098660c3be2f7652e41f4ffdd28fa258f22 100644 (file)
--- a/include/linux/mtd/gen_probe.h
+++ b/include/linux/mtd/gen_probe.h
@@ -10,7 +10,7 @@
 #include <linux/mtd/flashchip.h>
 #include <linux/mtd/map.h> 
 #include <linux/mtd/cfi.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 
 struct chip_probe {
        char *name;

diff --git a/include/net/pkt_act.h b/include/net/pkt_act.h
index e7e7da3550129ecfd7de7643fb07ad21a76f5223..7c30074c4a6fd607381f55e47a0c9f13f591dc11 100644 (file)
--- a/include/net/pkt_act.h
+++ b/include/net/pkt_act.h
@@ -3,7 +3,7 @@
 
 #include <asm/uaccess.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <linux/config.h>
 #include <linux/types.h>
 #include <linux/kernel.h>

diff --git a/kernel/rcupdate.c b/kernel/rcupdate.c
index 1b16bfc7d1eea593b8499e6942aa2464da485de1..80cac1cd0859b3a8b2857d67345a0b3cf3e7670b 100644 (file)
--- a/kernel/rcupdate.c
+++ b/kernel/rcupdate.c
@@ -38,7 +38,7 @@
 #include <linux/interrupt.h>
 #include <linux/sched.h>
 #include <asm/atomic.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <linux/module.h>
 #include <linux/completion.h>
 #include <linux/moduleparam.h>

diff --git a/lib/bitmap.c b/lib/bitmap.c
index 8ffd202dcdd6a1ebdf4bb9a672c90ae2b331a2a5..f7414e7fd04611739df4f4cc495e8b0f59e352aa 100644 (file)
--- a/lib/bitmap.c
+++ b/lib/bitmap.c
@@ -9,7 +9,7 @@
 #include <linux/ctype.h>
 #include <linux/errno.h>
 #include <linux/bitmap.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <asm/uaccess.h>
 
 /*

diff --git a/net/core/dev.c b/net/core/dev.c
index 5ab736ff0087ffaefb85135f18509c4880172464..88fffb4be34b7296dc3f54c98855212adac76b5c 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -74,7 +74,7 @@
 
 #include <asm/uaccess.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <linux/config.h>
 #include <linux/cpu.h>
 #include <linux/types.h>

diff --git a/net/core/dev_mcast.c b/net/core/dev_mcast.c
index e8ce25b759ee8a19642ae0f5d14e34473cf720bb..db098ff3cd6a7509b58cec0b45da50e6cf76673e 100644 (file)
--- a/net/core/dev_mcast.c
+++ b/net/core/dev_mcast.c
@@ -25,7 +25,7 @@
 #include <linux/module.h> 
 #include <asm/uaccess.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>

diff --git a/net/core/link_watch.c b/net/core/link_watch.c
index 6dd61ea39b2d859945c4f00d18ddb56cf6cba6b4..0a84b0d8db743ae4866a50963bee1517a83c7d47 100644 (file)
--- a/net/core/link_watch.c
+++ b/net/core/link_watch.c
@@ -22,7 +22,7 @@
 #include <linux/list.h>
 #include <linux/slab.h>
 #include <linux/workqueue.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <asm/types.h>
 
 

diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index 1d1c5451f3035230a206f0f593fa18236a43ad93..6cd292a83719c1e652f6629cefb870b6d7d7bd71 100644 (file)
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -74,8 +74,8 @@
 #include <linux/init.h>
 #include <linux/inet.h>
 #include <linux/rcupdate.h>
+#include <linux/bitops.h>
 #include <asm/byteorder.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/dma.h>
 #include <asm/uaccess.h>

diff --git a/net/econet/af_econet.c b/net/econet/af_econet.c
index fc31ae1209d1f96d8c8b1e04197f443a8094ed9c..03890eeb7fc46ece8bb843dd43e43a77bef13ef9 100644 (file)
--- a/net/econet/af_econet.c
+++ b/net/econet/af_econet.c
@@ -40,10 +40,10 @@
 #include <net/ip.h>
 #include <linux/spinlock.h>
 #include <linux/rcupdate.h>
+#include <linux/bitops.h>
 
 #include <asm/uaccess.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
 
 static struct proto_ops econet_ops;
 static struct hlist_head econet_sklist;

diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index 19eb795a11401a685fb4774555028f4578901993..bda63766b6abe82e99dcc643cee4179ade6a6d11 100644 (file)
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -31,7 +31,7 @@
 
 #include <asm/uaccess.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/kernel.h>

diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
index f13e797c32e8577275fdb327a131d1e04c0f88e0..4ccd02f535f735158dad9d8d730b7e9ecff61582 100644 (file)
--- a/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
@@ -19,7 +19,7 @@
 #include <linux/module.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>

diff --git a/net/ipv4/fib_hash.c b/net/ipv4/fib_hash.c
index 8aa5b76f465377bb917d74212fdc0352b440d2d9..21e11b49d74232d97c3f5fac4c99edb7ca040644 100644 (file)
--- a/net/ipv4/fib_hash.c
+++ b/net/ipv4/fib_hash.c
@@ -18,7 +18,7 @@
 #include <linux/config.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>

diff --git a/net/ipv4/fib_rules.c b/net/ipv4/fib_rules.c
index ee19a7e7a881653a484e3b613bcfec8b5886dadf..e4b3af075657b564b07485ba6587c4546e947020 100644 (file)
--- a/net/ipv4/fib_rules.c
+++ b/net/ipv4/fib_rules.c
@@ -22,7 +22,7 @@
 #include <linux/config.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>

diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
index e2a772d3bc4cc27cf07bd6b7ac7fe2a1822a53fb..ec1f08872f1d957c690d27183d446e4b4c176d3a 100644 (file)
--- a/net/ipv4/fib_semantics.c
+++ b/net/ipv4/fib_semantics.c
@@ -18,7 +18,7 @@
 #include <linux/config.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/jiffies.h>

diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 455cc0e775496fe62a6c52abfd5e1eb0ba3c37e2..fd023db82df98b555ef80eea09cccf9f17bca45f 100644 (file)
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -65,7 +65,7 @@
 #include <linux/module.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>

diff --git a/net/irda/irlan/irlan_client.c b/net/irda/irlan/irlan_client.c
index b849ecd541f5f59df51055b1eed3d522cae7ca1f..fbd7bf12fb44634427218e2eb2d55a15ee584157 100644 (file)
--- a/net/irda/irlan/irlan_client.c
+++ b/net/irda/irlan/irlan_client.c
@@ -33,10 +33,10 @@
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/if_arp.h>
+#include <linux/bitops.h>
 #include <net/arp.h>
 
 #include <asm/system.h>
-#include <asm/bitops.h>
 #include <asm/byteorder.h>
 
 #include <net/irda/irda.h>

diff --git a/net/irda/irlan/irlan_common.c b/net/irda/irlan/irlan_common.c
index e6599074e8af0c5bec3f57fdbf6588da3189bf7c..032ab40f913a56beca19f63ef0a57f98808ea584 100644 (file)
--- a/net/irda/irlan/irlan_common.c
+++ b/net/irda/irlan/irlan_common.c
@@ -37,9 +37,9 @@
 #include <linux/etherdevice.h>
 #include <linux/rtnetlink.h>
 #include <linux/moduleparam.h>
+#include <linux/bitops.h>
 
 #include <asm/system.h>
-#include <asm/bitops.h>
 #include <asm/byteorder.h>
 
 #include <net/irda/irda.h>

diff --git a/net/irda/irlan/irlan_provider.c b/net/irda/irlan/irlan_provider.c
index abf11e4a1bbcb6631abb146731bd6e387e6c32ee..2793c54f3462a6ba67014bc36be3797834b7e440 100644 (file)
--- a/net/irda/irlan/irlan_provider.c
+++ b/net/irda/irlan/irlan_provider.c
@@ -33,9 +33,9 @@
 #include <linux/etherdevice.h>
 #include <linux/init.h>
 #include <linux/random.h>
+#include <linux/bitops.h>
 
 #include <asm/system.h>
-#include <asm/bitops.h>
 #include <asm/byteorder.h>
 
 #include <net/irda/irda.h>

diff --git a/net/netlink/netlink_dev.c b/net/netlink/netlink_dev.c
index 72059f182a40f84264dafad455aa6b8868e8125f..59f53de4b86bf88d5f163237ffb99aae08106bcc 100644 (file)
--- a/net/netlink/netlink_dev.c
+++ b/net/netlink/netlink_dev.c
@@ -28,8 +28,8 @@
 #include <linux/devfs_fs_kernel.h>
 #include <linux/smp_lock.h>
 #include <linux/device.h>
+#include <linux/bitops.h>
 
-#include <asm/bitops.h>
 #include <asm/system.h>
 #include <asm/uaccess.h>
 

diff --git a/net/sched/act_api.c b/net/sched/act_api.c
index b189f5a28b393b496c063a6d23d51984ffaa4adb..a1243f0c062e4bc78f230a12f58d60f0339f6e02 100644 (file)
--- a/net/sched/act_api.c
+++ b/net/sched/act_api.c
@@ -13,7 +13,7 @@
 
 #include <asm/uaccess.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <linux/config.h>
 #include <linux/types.h>
 #include <linux/kernel.h>

diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c
index 71c85ad84ec82db8d275e8e1aef516cab9da0930..b66754d04cdc493760bec2b561fa93ffe16514fa 100644 (file)
--- a/net/sched/cls_api.c
+++ b/net/sched/cls_api.c
@@ -16,7 +16,7 @@
 
 #include <asm/uaccess.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/types.h>

diff --git a/net/sched/cls_fw.c b/net/sched/cls_fw.c
index 3ef250827a5961488c72e5e92997f8fc8d1ee9e2..4d8438a59e1fa757443314a719ebc8e7ae26cded 100644 (file)
--- a/net/sched/cls_fw.c
+++ b/net/sched/cls_fw.c
@@ -22,7 +22,7 @@
 #include <linux/module.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>

diff --git a/net/sched/cls_route.c b/net/sched/cls_route.c
index c2165492a3c3b713429666f2b3fd86b2327ae820..0762c74ae574e0a8d5111e50550a4ada5e81dd43 100644 (file)
--- a/net/sched/cls_route.c
+++ b/net/sched/cls_route.c
@@ -13,7 +13,7 @@
 #include <linux/config.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>

diff --git a/net/sched/cls_rsvp.c b/net/sched/cls_rsvp.c
index 05a937b59032df7e8a0873284800a3c0f1bc5f6e..69a56e921171bfdcc2b772a999854a6a5ecf3b96 100644 (file)
--- a/net/sched/cls_rsvp.c
+++ b/net/sched/cls_rsvp.c
@@ -12,7 +12,7 @@
 #include <linux/module.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>

diff --git a/net/sched/cls_rsvp6.c b/net/sched/cls_rsvp6.c
index 85ed7b400bb4bfae49530d42efe28be315c5e69a..9a0dac539f7817aedebfcab1f7856020950e29fc 100644 (file)
--- a/net/sched/cls_rsvp6.c
+++ b/net/sched/cls_rsvp6.c
@@ -12,7 +12,7 @@
 #include <linux/module.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>

diff --git a/net/sched/cls_u32.c b/net/sched/cls_u32.c
index bfe785eb0f573f67aac799d8e899c57ddc88c792..372e36efe54c41a27cef28f233bec69e4930ea3c 100644 (file)
--- a/net/sched/cls_u32.c
+++ b/net/sched/cls_u32.c
@@ -31,7 +31,7 @@
 
 #include <asm/uaccess.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/types.h>

diff --git a/net/sched/estimator.c b/net/sched/estimator.c
index 17eb0798bd31214e5b6b729f17636804f2b75d8f..f39a5187a75c1710aed80655462f407d9b8e5b6f 100644 (file)
--- a/net/sched/estimator.c
+++ b/net/sched/estimator.c
@@ -11,7 +11,7 @@
 
 #include <asm/uaccess.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/kernel.h>

diff --git a/net/sched/gact.c b/net/sched/gact.c
index 5607f5e8cd8313addcc2509ef43ced5dd2d32982..b1d4addd956ab90216a65e651a19247691f6c020 100644 (file)
--- a/net/sched/gact.c
+++ b/net/sched/gact.c
@@ -12,7 +12,7 @@
 
 #include <asm/uaccess.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <linux/config.h>
 #include <linux/types.h>
 #include <linux/kernel.h>

diff --git a/net/sched/police.c b/net/sched/police.c
index 12bd44006537668f955fc3f30f50bece458a211c..cb30e8ea9fef5a42b8cdd38162baa87d62906fb4 100644 (file)
--- a/net/sched/police.c
+++ b/net/sched/police.c
@@ -12,7 +12,7 @@
 
 #include <asm/uaccess.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/types.h>

diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
index 5da7b73126426a7b00188ebb93b854cb90914210..7818886af89de07b48f9865025d56d3f5c473cff 100644 (file)
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
@@ -35,6 +35,7 @@
 #include <linux/seq_file.h>
 #include <linux/kmod.h>
 #include <linux/list.h>
+#include <linux/bitops.h>
 
 #include <net/sock.h>
 #include <net/pkt_sched.h>
@@ -42,7 +43,6 @@
 #include <asm/processor.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
 
 static int qdisc_notify(struct sk_buff *oskb, struct nlmsghdr *n, u32 clid,
                        struct Qdisc *old, struct Qdisc *new);

diff --git a/net/sched/sch_cbq.c b/net/sched/sch_cbq.c
index 2ae73826d6cfb687e723d5f6dffe3314e51390f8..1a73822c8a93cf6c60c683045f0a8bc3f87b084d 100644 (file)
--- a/net/sched/sch_cbq.c
+++ b/net/sched/sch_cbq.c
@@ -14,7 +14,7 @@
 #include <linux/module.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>

diff --git a/net/sched/sch_fifo.c b/net/sched/sch_fifo.c
index b089924177f859fb3304db78ea90e2309a72a159..06acf4d7320d0c6134e6e20caea34f2471b0a2ad 100644 (file)
--- a/net/sched/sch_fifo.c
+++ b/net/sched/sch_fifo.c
@@ -13,7 +13,7 @@
 #include <linux/module.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>

diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index 2516dd92a0f13714cb1c5cd9ff7c797528a8301d..c91c4e4962a0429bf360efec989cb37aa2bcc3af 100644 (file)
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -13,7 +13,7 @@
 
 #include <asm/uaccess.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/types.h>

diff --git a/net/sched/sch_gred.c b/net/sched/sch_gred.c
index 375c6c2fb996933fc4b2555cf568a31de7b327df..aaf611899b25d9875bfdf58782018c01ba14bce8 100644 (file)
--- a/net/sched/sch_gred.c
+++ b/net/sched/sch_gred.c
@@ -24,7 +24,7 @@
 #include <linux/module.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>

diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c
index 61c8fa4db6080b3df2ab967a1c976bf29351352d..6f0fdc77fed25868186a889b854119906759447a 100644 (file)
--- a/net/sched/sch_htb.c
+++ b/net/sched/sch_htb.c
@@ -31,7 +31,7 @@
 #include <linux/module.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>

diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c
index d29df1cabf594ba609b354da8bf7ae2f148865c6..72fd04a6ae78d77b08a3762263db4f120a0632fa 100644 (file)
--- a/net/sched/sch_netem.c
+++ b/net/sched/sch_netem.c
@@ -15,7 +15,7 @@
 
 #include <linux/config.h>
 #include <linux/module.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>

diff --git a/net/sched/sch_prio.c b/net/sched/sch_prio.c
index 6961f081170f8990ee978041c5bc675af1dfa096..2c8bf5e3ed04192d21a2f7d399c18ec616e048bd 100644 (file)
--- a/net/sched/sch_prio.c
+++ b/net/sched/sch_prio.c
@@ -15,7 +15,7 @@
 #include <linux/module.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>

diff --git a/net/sched/sch_red.c b/net/sched/sch_red.c
index e98f79bdb435dee959745b7e714966e0bb7f6956..6be9a7779a3f939f78e6cbc80343ef8e96c8af17 100644 (file)
--- a/net/sched/sch_red.c
+++ b/net/sched/sch_red.c
@@ -18,7 +18,7 @@
 #include <linux/module.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>

diff --git a/net/sched/sch_sfq.c b/net/sched/sch_sfq.c
index ac668b08ebe9bf49ff55328e7a25576ff6a60fdf..160786fc3351404800a98baa7813a9e1755ea981 100644 (file)
--- a/net/sched/sch_sfq.c
+++ b/net/sched/sch_sfq.c
@@ -13,7 +13,7 @@
 #include <linux/module.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/jiffies.h>

diff --git a/net/sched/sch_tbf.c b/net/sched/sch_tbf.c
index a1df304714511551fdd5d63f2808517d735b494d..9f3699d2ccbea7a68bca3263dd0f9e63b1f4f73b 100644 (file)
--- a/net/sched/sch_tbf.c
+++ b/net/sched/sch_tbf.c
@@ -16,7 +16,7 @@
 #include <linux/module.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/jiffies.h>

diff --git a/net/sched/sch_teql.c b/net/sched/sch_teql.c
index dd169094aa2e631c217f5b97df810ee06b2c3bab..f358692716ccc3c6cc62295fba9844d19b3cfe0a 100644 (file)
--- a/net/sched/sch_teql.c
+++ b/net/sched/sch_teql.c
@@ -11,7 +11,7 @@
 #include <linux/module.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>

diff --git a/sound/pci/bt87x.c b/sound/pci/bt87x.c
index 85c825b8ad009762ca7ed4e19e852ed6714cc40a..67bccddaa383d20d3a0789e0c78031276581693c 100644 (file)
--- a/sound/pci/bt87x.c
+++ b/sound/pci/bt87x.c
@@ -27,8 +27,8 @@
 #include <linux/pci.h>
 #include <linux/slab.h>
 #include <linux/moduleparam.h>
+#include <linux/bitops.h>
 #include <asm/io.h>
-#include <asm/bitops.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>