diff options
Diffstat (limited to 'drivers')
194 files changed, 195 insertions, 197 deletions
diff --git a/drivers/acorn/block/fd1772.c b/drivers/acorn/block/fd1772.c index 0e7a399d2470..9cc2e8436b45 100644 --- 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 958a5e1f70c7..8dc889498306 100644 --- 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 d67d0385f20b..305e030eb447 100644 --- 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 b44fa7dd38c3..f039c84e8218 100644 --- 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 79ec1ce7841d..91e0a2edf720 100644 --- 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 bcf906bb24ff..b657ac4ff7cc 100644 --- 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 46002d5bada1..d3fd1c9c9301 100644 --- 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 b3289d9d23f5..452d45c7b13b 100644 --- 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 e8ad7da73f6f..7ee8a1d70ee8 100644 --- 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 e0cbd7552eb8..3d3ae6856bbd 100644 --- 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 11373907f29f..36b90e087031 100644 --- 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 8832ed21d412..0dee98b146fb 100644 --- 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 3e10c700d685..0a684d8cc112 100644 --- 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 5a3be050e7bf..3bca97c2ae45 100644 --- 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 f334dbfcf21f..522de1ec92c4 100644 --- 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 97fd9da9c5ef..d489a1322e0d 100644 --- 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 9826bbd0f67a..2e0eda2d40bf 100644 --- 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 4698af2d62e3..e0bb00f3c05d 100644 --- 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 9f13fad3fc11..4a0840ed50c9 100644 --- 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 b2538a6b85b0..028044f79045 100644 --- 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 edf89fffe4e1..84224b99353f 100644 --- 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 9ccce79fdf4e..cb4de2ebb15e 100644 --- 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 48d7a7cc0c2b..2fd2901ffc45 100644 --- 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 9d5e4ba9dc25..b27ae629e6e2 100644 --- 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 830c665a3bd5..d1060b2d5579 100644 --- 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 cffa77b92629..185d19ab1214 100644 --- 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 ebcaf79ce8bc..ab659d37b4d2 100644 --- 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 a6781dede6c8..eb13091b8b15 100644 --- 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 3f8b4c15115d..392e216696d9 100644 --- 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 5ee4dda53743..162985ca9d57 100644 --- 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 ef6e2c8c21d3..a6bea5d0de03 100644 --- 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 3b092c387193..39819daed56c 100644 --- 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 c104120ae669..d2316daebd38 100644 --- 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 b2fa5eccdcad..8acad305be8b 100644 --- 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 3ec7ff671c65..82e471ffd713 100644 --- 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 4a8019475c02..c7eea8dd31a3 100644 --- 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 5f0a43527219..75baad1eafca 100644 --- 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 7d5ecce92346..a56ea2b73f12 100644 --- 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 fd80b86388a9..baf4bcad9bf9 100644 --- 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 a3a5372f7aeb..e35a141adaa6 100644 --- 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 d1f54a9ad324..e5f6bb754f5a 100644 --- 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 aea1a1be5845..b6050c837bb6 100644 --- 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 e33fdd99b3d3..f53ce50411a2 100644 --- 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 0dceacee31d5..d221723ac909 100644 --- 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 f3fed48366cf..32292be4bacc 100644 --- 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 0c99115637bf..7628bda82c91 100644 --- 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 3aa8409fe5f9..6bff013a941d 100644 --- 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 4866a09c0708..8c2a06bfefc7 100644 --- 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 b053f53bb13e..7d25f2e36fc7 100644 --- 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 bcdc0d60846a..7dca6e585e66 100644 --- 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 1902f792199e..0a5df59d46fd 100644 --- 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 a39c446c3429..15550b1442f8 100644 --- 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 adcbf6853357..5b45341d3a6a 100644 --- 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 0e5aec0d57d1..a18ecab20637 100644 --- 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 c835712edef9..33bcdf612cba 100644 --- 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 04dcacda870d..c89a61289401 100644 --- 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 0d95f0bf964c..8e538a6d7d97 100644 --- 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 925dd04774fa..00bb1b2ae4a0 100644 --- 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 70a7a181b8d8..118503bc3823 100644 --- 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 10a94c54427e..9fe93acfc8ef 100644 --- 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 a6d42aa9fac5..9b659e3c8d67 100644 --- 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 fb401b27c3b1..6118f09c63cf 100644 --- 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 d054876b9673..e0d22a31ea12 100644 --- 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 d861c54a7766..f3f1a483f8ca 100644 --- 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 a3e7e63c39a6..0dcf27a51dd6 100644 --- 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 92a2ec2e51da..1798ce7262c9 100644 --- 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 c74e5866293a..81c362c8cb97 100644 --- 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 e462e2fca538..a5dfb1276c2d 100644 --- 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 fd2e033fecc1..662e40f30031 100644 --- 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 afcdcffc7847..3328ed511bf8 100644 --- 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 e62ad3ad6e58..55a0f66f6cf8 100644 --- 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 6917b665b65a..e1097f90c883 100644 --- 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 3ce3237b1686..e8c74071fed3 100644 --- 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 85d1bb3a9865..c7ef439ea1de 100644 --- 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 5d62a032b8c8..49ebfbe6cff8 100644 --- 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 639aa7508502..779af1727eef 100644 --- 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 d46367392595..6e75482d75f2 100644 --- 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 1951644a9afc..30c7d5433b69 100644 --- 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 9f5ea60758b1..3f05a33e7c69 100644 --- 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 13850a3177c0..e02b6aec703a 100644 --- 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 1880fc0ba665..8d0585f7841b 100644 --- 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 ec327ad3a33f..459013762bd8 100644 --- 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 5a9ae260f3d6..39f678270705 100644 --- 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 ccc8c52669e3..8f995141b518 100644 --- 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 9112ca037315..fddc5360fd1c 100644 --- 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 b9e59da66b56..645122086a94 100644 --- 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 7d73661aa367..29c275e1d566 100644 --- 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 1bf15eed626a..b4f3a9f8a535 100644 --- 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 700233655e52..8fd1495fafe2 100644 --- 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 f0b6f9c9dcfb..04c748523471 100644 --- 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 a41ccc452007..b6f1e8be445b 100644 --- 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 7dda9988e13b..9b885efadf00 100644 --- 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 e6dba5623add..738cef65b728 100644 --- 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 4bd7c09656d8..77f29fdde8ef 100644 --- 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 86deb52100be..8e115b5a6a11 100644 --- 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 e2a28b562446..d51712a17fd3 100644 --- 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 2049556d1764..8da1948026c6 100644 --- 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 c516e7156ca1..acae5949a9ea 100644 --- 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 675ad8f523db..2392d4523a3d 100644 --- 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 fecaec10291d..6e0ca7340a8f 100644 --- 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 6b0328fbc97b..a68b29245b90 100644 --- 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 0aa0a826128c..e58b31c918a9 100644 --- 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 c5af0cb78905..a02a2a25aa07 100644 --- 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 6ad80edb2efa..c2c26b605357 100644 --- 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 650943395087..50bebb55e9ee 100644 --- 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 24311a57a376..d5c6f477f916 100644 --- 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 8624bfc4905b..7046c4395266 100644 --- 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 f04d0a82cf3b..87acad34266f 100644 --- 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 b315acb14362..188562f70130 100644 --- 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 c87d90a837fb..70be2a9e3820 100644 --- 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 0a8094eb3061..c4d742f67013 100644 --- 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 e67bf67f122f..a4dde8181d25 100644 --- 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 41d38b3b3b4f..362fee325e0a 100644 --- 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 c5f95959ccbe..d85e04bd7490 100644 --- 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 41d93758bb3c..5bb12dc93496 100644 --- 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 5d690c9f1d25..4fe6e7574855 100644 --- 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 8124ad671698..2ab01a5d1d22 100644 --- 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 234709ded746..a76c8575ccff 100644 --- 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 c43c4cf9e837..fd58f0d9e644 100644 --- 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 7c4ed0ddd12a..b5c99d2f37b6 100644 --- 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 2e0135dad547..970ed7bb596f 100644 --- 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 0d9a06f8c561..3029129ae650 100644 --- 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 947dad4ca55a..0ec78c327343 100644 --- 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 5be2ba3b03e8..25c2fc991405 100644 --- 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 a0af06c18a23..74d9062dc1c9 100644 --- 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 937b6198c229..3dd010328f16 100644 --- 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 03f28fdc0629..dcc64eb8dc4a 100644 --- 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 e0f88fbd33f5..1534679529d2 100644 --- 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 0f237b54d5b3..d9fd93004730 100644 --- 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 b71f45f5cb58..4385cd1677a0 100644 --- 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 8ddf9d02f973..7bb0e9019d3c 100644 --- 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 21d807390738..e65a19f8794a 100644 --- 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 58775e61963d..5db59c43f6a2 100644 --- 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 bc71b55a99c0..425012d48f07 100644 --- 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 2039f22338fc..07b980281666 100644 --- 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 8308bcc14ac6..e9ef28cbbd29 100644 --- 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 0c1995bc2848..01c2c3e1d102 100644 --- 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 f5071b047315..de31ab71384c 100644 --- 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 053fcaf1c9e2..d5a58fb30d3a 100644 --- 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 6faef842db46..1f43bbfbc1c7 100644 --- 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 25d35022bdb8..025dcd867eaa 100644 --- 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 42f665496524..776403daf634 100644 --- 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 eab667c7b1c6..85c1e1e5e89b 100644 --- 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 0a11b5627804..525b9ca61972 100644 --- 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 6e4bb5781fe9..d2d34594bae7 100644 --- 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 1ed3ff5b3519..37ef1b82a6cb 100644 --- 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 952ef81775fb..c2ec9fd8c31d 100644 --- 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 a50df64b212c..47d7d6d4ca64 100644 --- 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 dcf7f3e8ce93..63005ae6a418 100644 --- 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 1ec45b2b9f4c..eed699bafbc8 100644 --- 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 599057ac316f..1331fd1d8f90 100644 --- 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 9d121890b6fb..df43b449e429 100644 --- 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 05e8947f9047..7afae1f70483 100644 --- 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 7353f28ccc34..dfcb1657a0ac 100644 --- 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 7174a278bddd..5bf05492a0ec 100644 --- 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 6e65890391a6..1555d632266d 100644 --- 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 d22567ede974..d763bf6d310f 100644 --- 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 33c3137c016e..5a011ee958b9 100644 --- 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 bad0d418580b..6e1ec5bf22fc 100644 --- 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 c98d7eca5c92..c96f5aaf4529 100644 --- 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 b9800715d739..f88d9b64eafa 100644 --- 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 2aca8dc986f1..f55ce76b00ed 100644 --- 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 bb9f1eab7cdb..74876c0073e8 100644 --- 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 12598181abed..f0ed00ef06fe 100644 --- 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 467ad7b8cd86..c29233115d3f 100644 --- 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 4246f6b8b656..0360693eb6fc 100644 --- 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 a48af699c9c5..e499f4b52a51 100644 --- 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 13641142bf77..15708eb78521 100644 --- 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 7f44588cb6e7..69c92876f7fd 100644 --- 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 24e66a8c2de1..475add67f5bf 100644 --- 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 381876f542a7..0c18af262494 100644 --- 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 53fb0e88235c..9c2d0752ab90 100644 --- 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 9ebd5ea34b88..d26121fa61df 100644 --- 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 fd404eee5c6f..56ced25d993c 100644 --- 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 0bb9017d0b77..a651309eb84f 100644 --- 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 6a1cb3f86be9..ba0348a5fe06 100644 --- 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 e95272f1a03e..16e8e69afb10 100644 --- 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 063430d3f2bc..56f0923c3219 100644 --- 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 1ff81bec8741..db4c1c2b799c 100644 --- 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 c407e8643bab..c685d546f838 100644 --- 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 e5e86962f0d1..24dd0b890dd2 100644 --- 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 c3d8bc82eb74..af8adb629b33 100644 --- 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 cb0a05d56722..3d0a0f2f7f89 100644 --- 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 6dd522466d34..299c2bcea221 100644 --- 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 2d69c47e61db..ef536ae16861 100644 --- 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 efa91660adcd..5c8f1fbd5040 100644 --- 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 c15c8a0aac58..df71e2370f97 100644 --- 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 7f1b9ee7e03f..46bcd19f2c45 100644 --- 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 72586594be4c..bda0c8088fac 100644 --- 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 b44e820a6d8b..ad5b776d779b 100644 --- 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 c5befc9af125..74aea012129c 100644 --- 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 95dce5995859..b9f57d391a34 100644 --- 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 920fbd6608e5..decd7ab1c7fe 100644 --- 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 c10bc4bcd383..6d70b40d3fa5 100644 --- 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" |