From: Adrian Bunk <bunk@stusta.de>

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>
---

 25-akpm/Documentation/DocBook/kernel-hacking.tmpl |    2 +-
 25-akpm/arch/alpha/kernel/irq.c                   |    2 +-
 25-akpm/arch/alpha/kernel/signal.c                |    2 +-
 25-akpm/arch/alpha/kernel/smp.c                   |    2 +-
 25-akpm/arch/alpha/kernel/sys_alcor.c             |    2 +-
 25-akpm/arch/alpha/kernel/sys_cabriolet.c         |    2 +-
 25-akpm/arch/alpha/kernel/sys_dp264.c             |    2 +-
 25-akpm/arch/alpha/kernel/sys_eb64p.c             |    2 +-
 25-akpm/arch/alpha/kernel/sys_eiger.c             |    2 +-
 25-akpm/arch/alpha/kernel/sys_marvel.c            |    2 +-
 25-akpm/arch/alpha/kernel/sys_mikasa.c            |    2 +-
 25-akpm/arch/alpha/kernel/sys_nautilus.c          |    2 +-
 25-akpm/arch/alpha/kernel/sys_noritake.c          |    2 +-
 25-akpm/arch/alpha/kernel/sys_rx164.c             |    2 +-
 25-akpm/arch/alpha/kernel/sys_sx164.c             |    2 +-
 25-akpm/arch/alpha/kernel/sys_titan.c             |    2 +-
 25-akpm/arch/alpha/kernel/sys_wildfire.c          |    2 +-
 25-akpm/arch/arm/vfp/vfpdouble.c                  |    2 +-
 25-akpm/arch/arm/vfp/vfpsingle.c                  |    2 +-
 25-akpm/arch/arm26/machine/small_page.c           |    2 +-
 25-akpm/arch/cris/arch-v10/drivers/ethernet.c     |    2 +-
 25-akpm/arch/cris/arch-v10/drivers/serial.c       |    2 +-
 25-akpm/arch/cris/kernel/irq.c                    |    2 +-
 25-akpm/arch/i386/kernel/i8259.c                  |    2 +-
 25-akpm/arch/ia64/hp/common/sba_iommu.c           |    2 +-
 25-akpm/arch/ia64/hp/sim/simeth.c                 |    2 +-
 25-akpm/arch/ia64/kernel/irq.c                    |    2 +-
 25-akpm/arch/ia64/kernel/irq_ia64.c               |    2 +-
 25-akpm/arch/ia64/kernel/perfmon.c                |    2 +-
 25-akpm/arch/ia64/kernel/smp.c                    |    2 +-
 25-akpm/arch/ia64/kernel/smpboot.c                |    2 +-
 25-akpm/arch/ia64/lib/bitop.c                     |    2 +-
 25-akpm/arch/ia64/mm/init.c                       |    2 +-
 25-akpm/arch/ia64/sn/kernel/irq.c                 |    2 +-
 25-akpm/arch/ia64/sn/kernel/sn2/sn2_smp.c         |    2 +-
 25-akpm/arch/m32r/kernel/irq.c                    |    2 +-
 25-akpm/arch/m32r/mm/init.c                       |    2 +-
 25-akpm/arch/m68k/sun3/mmu_emu.c                  |    2 +-
 25-akpm/arch/mips/au1000/common/au1xxx_irqmap.c   |    2 +-
 25-akpm/arch/mips/au1000/common/irq.c             |    2 +-
 25-akpm/arch/mips/au1000/csb250/irqmap.c          |    2 +-
 25-akpm/arch/mips/au1000/db1x00/irqmap.c          |    2 +-
 25-akpm/arch/mips/au1000/hydrogen3/irqmap.c       |    2 +-
 25-akpm/arch/mips/au1000/mtx-1/irqmap.c           |    2 +-
 25-akpm/arch/mips/au1000/pb1000/irqmap.c          |    2 +-
 25-akpm/arch/mips/au1000/pb1100/irqmap.c          |    2 +-
 25-akpm/arch/mips/au1000/pb1500/irqmap.c          |    2 +-
 25-akpm/arch/mips/au1000/pb1550/irqmap.c          |    2 +-
 25-akpm/arch/mips/au1000/xxs1500/irqmap.c         |    2 +-
 25-akpm/arch/mips/baget/irq.c                     |    2 +-
 25-akpm/arch/mips/gt64120/ev64120/irq.c           |    2 +-
 25-akpm/arch/mips/gt64120/momenco_ocelot/irq.c    |    2 +-
 25-akpm/arch/mips/ite-boards/generic/irq.c        |    2 +-
 25-akpm/arch/mips/jmr3927/rbhma3100/irq.c         |    2 +-
 25-akpm/arch/mips/kernel/signal.c                 |    2 +-
 25-akpm/arch/mips/kernel/signal32.c               |    2 +-
 25-akpm/arch/mips/kernel/signal_n32.c             |    2 +-
 25-akpm/arch/mips/momentum/ocelot_c/irq.c         |    2 +-
 25-akpm/arch/mips/momentum/ocelot_g/irq.c         |    2 +-
 25-akpm/arch/mips/pmc-sierra/yosemite/irq.c       |    2 +-
 25-akpm/arch/mips/sgi-ip27/ip27-irq.c             |    2 +-
 25-akpm/arch/mips/sgi-ip32/ip32-irq.c             |    1 -
 25-akpm/arch/mips/tx4927/common/tx4927_irq.c      |    2 +-
 25-akpm/arch/mips/tx4927/common/tx4927_setup.c    |    2 +-
 25-akpm/arch/parisc/kernel/smp.c                  |    2 +-
 25-akpm/arch/ppc/4xx_io/serial_sicc.c             |    2 +-
 25-akpm/arch/ppc/8260_io/enet.c                   |    2 +-
 25-akpm/arch/ppc/8260_io/fcc_enet.c               |    2 +-
 25-akpm/arch/ppc/8xx_io/enet.c                    |    2 +-
 25-akpm/arch/ppc/8xx_io/fec.c                     |    2 +-
 25-akpm/arch/ppc/kernel/bitops.c                  |    2 +-
 25-akpm/arch/ppc/kernel/irq.c                     |    2 +-
 25-akpm/arch/ppc/kernel/ppc_htab.c                |    2 +-
 25-akpm/arch/ppc/kernel/ppc_ksyms.c               |    2 +-
 25-akpm/arch/ppc/platforms/pmac_setup.c           |    2 +-
 25-akpm/arch/ppc/syslib/prom.c                    |    2 +-
 25-akpm/arch/ppc/syslib/prom_init.c               |    2 +-
 25-akpm/arch/ppc/xmon/start.c                     |    4 +---
 25-akpm/arch/ppc/xmon/xmon.c                      |    2 +-
 25-akpm/arch/ppc64/kernel/LparData.c              |    2 +-
 25-akpm/arch/ppc64/kernel/bitops.c                |    2 +-
 25-akpm/arch/ppc64/kernel/iommu.c                 |    2 +-
 25-akpm/arch/ppc64/kernel/irq.c                   |    2 +-
 25-akpm/arch/ppc64/kernel/lmb.c                   |    2 +-
 25-akpm/arch/ppc64/kernel/pmac_setup.c            |    3 +--
 25-akpm/arch/ppc64/kernel/ppc_ksyms.c             |    2 +-
 25-akpm/arch/ppc64/kernel/prom.c                  |    2 +-
 25-akpm/arch/ppc64/kernel/prom_init.c             |    2 +-
 25-akpm/arch/ppc64/kernel/ras.c                   |    2 +-
 25-akpm/arch/ppc64/kernel/rtas-proc.c             |    2 +-
 25-akpm/arch/sh/boards/bigsur/irq.c               |    2 +-
 25-akpm/arch/sh/boards/bigsur/setup.c             |    2 +-
 25-akpm/arch/sh/kernel/cpu/irq_imask.c            |    2 +-
 25-akpm/arch/sh/kernel/irq.c                      |    2 +-
 25-akpm/arch/sh64/kernel/irq.c                    |    2 +-
 25-akpm/arch/sh64/kernel/irq_intc.c               |    6 +++---
 25-akpm/arch/sparc/kernel/signal.c                |    2 +-
 25-akpm/arch/sparc/lib/bitext.c                   |    2 +-
 25-akpm/arch/sparc/mm/io-unit.c                   |    2 +-
 25-akpm/arch/sparc64/kernel/signal.c              |    2 +-
 25-akpm/arch/sparc64/kernel/signal32.c            |    2 +-
 25-akpm/arch/sparc64/kernel/unaligned.c           |    2 +-
 25-akpm/arch/sparc64/lib/find_bit.c               |    2 +-
 25-akpm/arch/v850/kernel/fpga85e2c.c              |    2 +-
 25-akpm/arch/x86_64/kernel/i8259.c                |    2 +-
 25-akpm/arch/x86_64/kernel/pci-gart.c             |    2 +-
 25-akpm/arch/x86_64/kernel/setup64.c              |    2 +-
 25-akpm/arch/x86_64/lib/bitops.c                  |    2 +-
 25-akpm/arch/x86_64/lib/bitstr.c                  |    2 +-
 25-akpm/drivers/acorn/block/fd1772.c              |    2 +-
 25-akpm/drivers/block/z2ram.c                     |    2 +-
 25-akpm/drivers/bluetooth/bt3c_cs.c               |    2 +-
 25-akpm/drivers/bluetooth/btuart_cs.c             |    2 +-
 25-akpm/drivers/bluetooth/dtl1_cs.c               |    2 +-
 25-akpm/drivers/char/amiserial.c                  |    2 +-
 25-akpm/drivers/char/cyclades.c                   |    2 +-
 25-akpm/drivers/char/ec3104_keyb.c                |    2 +-
 25-akpm/drivers/char/hpet.c                       |    2 +-
 25-akpm/drivers/char/ip2main.c                    |    2 +-
 25-akpm/drivers/char/moxa.c                       |    2 +-
 25-akpm/drivers/char/mwave/3780i.c                |    2 +-
 25-akpm/drivers/char/n_hdlc.c                     |    2 +-
 25-akpm/drivers/char/n_tty.c                      |    2 +-
 25-akpm/drivers/char/pcmcia/synclink_cs.c         |    2 +-
 25-akpm/drivers/char/pcxx.c                       |    2 +-
 25-akpm/drivers/char/pty.c                        |    2 +-
 25-akpm/drivers/char/qtronix.c                    |    2 +-
 25-akpm/drivers/char/rocket.c                     |    2 +-
 25-akpm/drivers/char/serial167.c                  |    2 +-
 25-akpm/drivers/char/synclink.c                   |    2 +-
 25-akpm/drivers/char/synclinkmp.c                 |    2 +-
 25-akpm/drivers/char/tipar.c                      |    2 +-
 25-akpm/drivers/char/tty_io.c                     |    2 +-
 25-akpm/drivers/char/tty_ioctl.c                  |    2 +-
 25-akpm/drivers/char/vt.c                         |    2 +-
 25-akpm/drivers/char/watchdog/ixp2000_wdt.c       |    2 +-
 25-akpm/drivers/char/watchdog/ixp4xx_wdt.c        |    2 +-
 25-akpm/drivers/fc4/soc.c                         |    2 +-
 25-akpm/drivers/fc4/socal.c                       |    2 +-
 25-akpm/drivers/ide/ide-default.c                 |    2 +-
 25-akpm/drivers/ide/ide-floppy.c                  |    2 +-
 25-akpm/drivers/ide/ide-iops.c                    |    2 +-
 25-akpm/drivers/ide/ide-lib.c                     |    2 +-
 25-akpm/drivers/ide/ide-tape.c                    |    2 +-
 25-akpm/drivers/ide/ide-taskfile.c                |    2 +-
 25-akpm/drivers/ide/ide.c                         |    2 +-
 25-akpm/drivers/input/serio/q40kbd.c              |    2 +-
 25-akpm/drivers/isdn/i4l/isdn_bsdcomp.c           |    2 +-
 25-akpm/drivers/macintosh/macserial.c             |    2 +-
 25-akpm/drivers/md/raid5.c                        |    2 +-
 25-akpm/drivers/md/raid6main.c                    |    2 +-
 25-akpm/drivers/media/dvb/bt8xx/dvb-bt8xx.c       |    2 +-
 25-akpm/drivers/media/dvb/frontends/at76c651.c    |    5 +----
 25-akpm/drivers/media/dvb/ttpci/av7110_ir.c       |    2 +-
 25-akpm/drivers/net/3c501.c                       |    2 +-
 25-akpm/drivers/net/3c505.c                       |    2 +-
 25-akpm/drivers/net/3c507.c                       |    2 +-
 25-akpm/drivers/net/3c509.c                       |    2 +-
 25-akpm/drivers/net/3c515.c                       |    2 +-
 25-akpm/drivers/net/3c523.c                       |    2 +-
 25-akpm/drivers/net/3c527.c                       |    2 +-
 25-akpm/drivers/net/3c59x.c                       |    2 +-
 25-akpm/drivers/net/7990.c                        |    2 +-
 25-akpm/drivers/net/82596.c                       |    2 +-
 25-akpm/drivers/net/8390.c                        |    2 +-
 25-akpm/drivers/net/a2065.c                       |    2 +-
 25-akpm/drivers/net/appletalk/cops.c              |    2 +-
 25-akpm/drivers/net/appletalk/ltpc.c              |    2 +-
 25-akpm/drivers/net/ariadne.c                     |    2 +-
 25-akpm/drivers/net/arm/am79c961a.c               |    2 +-
 25-akpm/drivers/net/arm/ether1.c                  |    2 +-
 25-akpm/drivers/net/arm/ether3.c                  |    2 +-
 25-akpm/drivers/net/arm/etherh.c                  |    2 +-
 25-akpm/drivers/net/at1700.c                      |    2 +-
 25-akpm/drivers/net/atari_bionet.c                |    2 +-
 25-akpm/drivers/net/atari_pamsnet.c               |    2 +-
 25-akpm/drivers/net/atarilance.c                  |    2 +-
 25-akpm/drivers/net/atp.c                         |    2 +-
 25-akpm/drivers/net/au1000_eth.c                  |    2 +-
 25-akpm/drivers/net/bagetlance.c                  |    2 +-
 25-akpm/drivers/net/bonding/bond_main.c           |    2 +-
 25-akpm/drivers/net/cs89x0.c                      |    2 +-
 25-akpm/drivers/net/defxx.c                       |    2 +-
 25-akpm/drivers/net/depca.c                       |    2 +-
 25-akpm/drivers/net/dgrs.c                        |    2 +-
 25-akpm/drivers/net/dl2k.h                        |    2 +-
 25-akpm/drivers/net/e1000/e1000.h                 |    2 +-
 25-akpm/drivers/net/eepro.c                       |    2 +-
 25-akpm/drivers/net/eepro100.c                    |    2 +-
 25-akpm/drivers/net/eexpress.c                    |    2 +-
 25-akpm/drivers/net/epic100.c                     |    2 +-
 25-akpm/drivers/net/eth16i.c                      |    2 +-
 25-akpm/drivers/net/ewrk3.c                       |    2 +-
 25-akpm/drivers/net/fealnx.c                      |    2 +-
 25-akpm/drivers/net/fec.c                         |    2 +-
 25-akpm/drivers/net/fec_8xx/fec_8xx-netta.c       |    2 +-
 25-akpm/drivers/net/fec_8xx/fec_main.c            |    2 +-
 25-akpm/drivers/net/fec_8xx/fec_mii.c             |    2 +-
 25-akpm/drivers/net/fmv18x.c                      |    2 +-
 25-akpm/drivers/net/gt96100eth.c                  |    2 +-
 25-akpm/drivers/net/hamachi.c                     |    2 +-
 25-akpm/drivers/net/hamradio/6pack.c              |    2 +-
 25-akpm/drivers/net/hamradio/baycom_par.c         |    2 +-
 25-akpm/drivers/net/hamradio/hdlcdrv.c            |    2 +-
 25-akpm/drivers/net/hamradio/mkiss.c              |    2 +-
 25-akpm/drivers/net/hamradio/scc.c                |    2 +-
 25-akpm/drivers/net/hamradio/yam.c                |    2 +-
 25-akpm/drivers/net/hp100.c                       |    2 +-
 25-akpm/drivers/net/hydra.c                       |    2 +-
 25-akpm/drivers/net/ibm_emac/ibm_emac_core.c      |    2 +-
 25-akpm/drivers/net/ibmlana.c                     |    2 +-
 25-akpm/drivers/net/irda/au1k_ir.c                |    2 +-
 25-akpm/drivers/net/irda/irport.c                 |    2 +-
 25-akpm/drivers/net/isa-skeleton.c                |    2 +-
 25-akpm/drivers/net/ixgb/ixgb.h                   |    2 +-
 25-akpm/drivers/net/jazzsonic.c                   |    2 +-
 25-akpm/drivers/net/lance.c                       |    2 +-
 25-akpm/drivers/net/lasi_82596.c                  |    2 +-
 25-akpm/drivers/net/lp486e.c                      |    2 +-
 25-akpm/drivers/net/mac8390.c                     |    2 +-
 25-akpm/drivers/net/macsonic.c                    |    2 +-
 25-akpm/drivers/net/mv643xx_eth.c                 |    2 +-
 25-akpm/drivers/net/myri_sbus.c                   |    2 +-
 25-akpm/drivers/net/natsemi.c                     |    2 +-
 25-akpm/drivers/net/ne2.c                         |    2 +-
 25-akpm/drivers/net/ni5010.c                      |    2 +-
 25-akpm/drivers/net/ni52.c                        |    2 +-
 25-akpm/drivers/net/ni65.c                        |    2 +-
 25-akpm/drivers/net/pcmcia/3c574_cs.c             |    2 +-
 25-akpm/drivers/net/pcmcia/3c589_cs.c             |    2 +-
 25-akpm/drivers/net/pcmcia/axnet_cs.c             |    2 +-
 25-akpm/drivers/net/pcmcia/nmclan_cs.c            |    2 +-
 25-akpm/drivers/net/pcmcia/xirc2ps_cs.c           |    2 +-
 25-akpm/drivers/net/pcnet32.c                     |    2 +-
 25-akpm/drivers/net/plip.c                        |    2 +-
 25-akpm/drivers/net/sb1000.c                      |    2 +-
 25-akpm/drivers/net/sb1250-mac.c                  |    2 +-
 25-akpm/drivers/net/seeq8005.c                    |    2 +-
 25-akpm/drivers/net/sgiseeq.c                     |    2 +-
 25-akpm/drivers/net/sis900.c                      |    2 +-
 25-akpm/drivers/net/sk98lin/h/skdrv1st.h          |    2 +-
 25-akpm/drivers/net/sk98lin/skge.c                |    2 +-
 25-akpm/drivers/net/sk_g16.c                      |    2 +-
 25-akpm/drivers/net/sk_mca.c                      |    2 +-
 25-akpm/drivers/net/skfp/skfddi.c                 |    2 +-
 25-akpm/drivers/net/slip.c                        |    2 +-
 25-akpm/drivers/net/smc9194.c                     |    2 +-
 25-akpm/drivers/net/sun3_82586.c                  |    2 +-
 25-akpm/drivers/net/sun3lance.c                   |    2 +-
 25-akpm/drivers/net/sunbmac.c                     |    2 +-
 25-akpm/drivers/net/sundance.c                    |    2 +-
 25-akpm/drivers/net/sungem.c                      |    2 +-
 25-akpm/drivers/net/sunhme.c                      |    2 +-
 25-akpm/drivers/net/sunlance.c                    |    2 +-
 25-akpm/drivers/net/sunqe.c                       |    2 +-
 25-akpm/drivers/net/tc35815.c                     |    2 +-
 25-akpm/drivers/net/tokenring/3c359.c             |    2 +-
 25-akpm/drivers/net/tokenring/lanstreamer.c       |    2 +-
 25-akpm/drivers/net/tokenring/olympic.c           |    2 +-
 25-akpm/drivers/net/tokenring/smctr.c             |    2 +-
 25-akpm/drivers/net/tokenring/tms380tr.c          |    2 +-
 25-akpm/drivers/net/tulip/de4x5.c                 |    2 +-
 25-akpm/drivers/net/tulip/dmfe.c                  |    2 +-
 25-akpm/drivers/net/tulip/winbond-840.c           |    2 +-
 25-akpm/drivers/net/tulip/xircom_cb.c             |    2 +-
 25-akpm/drivers/net/typhoon.c                     |    2 +-
 25-akpm/drivers/net/via-rhine.c                   |    2 +-
 25-akpm/drivers/net/wan/dlci.c                    |    2 +-
 25-akpm/drivers/net/wan/hd6457x.c                 |    2 +-
 25-akpm/drivers/net/wan/lmc/lmc_main.c            |    2 +-
 25-akpm/drivers/net/wan/lmc/lmc_media.c           |    2 +-
 25-akpm/drivers/net/wan/lmc/lmc_proto.c           |    2 +-
 25-akpm/drivers/net/wan/sdla.c                    |    2 +-
 25-akpm/drivers/net/wan/x25_asy.c                 |    2 +-
 25-akpm/drivers/net/wireless/airo.c               |    2 +-
 25-akpm/drivers/net/wireless/arlan.h              |    2 +-
 25-akpm/drivers/net/wireless/netwave_cs.c         |    2 +-
 25-akpm/drivers/net/wireless/strip.c              |    2 +-
 25-akpm/drivers/net/wireless/wavelan.p.h          |    2 +-
 25-akpm/drivers/net/wireless/wavelan_cs.p.h       |    2 +-
 25-akpm/drivers/net/yellowfin.c                   |    2 +-
 25-akpm/drivers/net/znet.c                        |    2 +-
 25-akpm/drivers/pcmcia/i82365.c                   |    2 +-
 25-akpm/drivers/pcmcia/tcic.c                     |    2 +-
 25-akpm/drivers/s390/net/ctcmain.c                |    2 +-
 25-akpm/drivers/s390/net/netiucv.c                |    2 +-
 25-akpm/drivers/s390/net/qeth.h                   |    3 ++-
 25-akpm/drivers/sbus/char/aurora.c                |    2 +-
 25-akpm/drivers/scsi/NCR53c406a.c                 |    2 +-
 25-akpm/drivers/scsi/arm/acornscsi.c              |    2 +-
 25-akpm/drivers/scsi/atari_scsi.c                 |    2 +-
 25-akpm/drivers/scsi/ultrastor.c                  |    2 +-
 25-akpm/drivers/serial/68328serial.c              |    2 +-
 25-akpm/drivers/serial/8250_pci.c                 |    2 +-
 25-akpm/drivers/serial/8250_pnp.c                 |    2 +-
 25-akpm/drivers/serial/icom.c                     |    2 +-
 25-akpm/drivers/serial/mcfserial.c                |    2 +-
 25-akpm/drivers/serial/pmac_zilog.c               |    2 +-
 25-akpm/drivers/serial/sh-sci.c                   |    2 +-
 25-akpm/drivers/tc/zs.c                           |    2 +-
 25-akpm/drivers/usb/host/uhci-hcd.c               |    2 +-
 25-akpm/drivers/usb/net/catc.c                    |    2 +-
 25-akpm/drivers/zorro/zorro.c                     |    2 +-
 25-akpm/fs/adfs/super.c                           |    2 +-
 25-akpm/fs/autofs/inode.c                         |    2 +-
 25-akpm/fs/autofs4/inode.c                        |    2 +-
 25-akpm/fs/buffer.c                               |    2 +-
 25-akpm/fs/coda/sysctl.c                          |    2 +-
 25-akpm/fs/devfs/base.c                           |    2 +-
 25-akpm/fs/devfs/util.c                           |    2 +-
 25-akpm/fs/eventpoll.c                            |    2 +-
 25-akpm/fs/ext3/ialloc.c                          |    2 +-
 25-akpm/fs/file.c                                 |    3 +--
 25-akpm/fs/jfs/jfs_incore.h                       |    2 +-
 25-akpm/fs/minix/bitmap.c                         |    2 +-
 25-akpm/fs/partitions/devfs.c                     |    2 +-
 25-akpm/fs/proc/generic.c                         |    2 +-
 25-akpm/fs/proc/proc_tty.c                        |    2 +-
 25-akpm/fs/proc/root.c                            |    2 +-
 25-akpm/fs/qnx4/bitmap.c                          |    3 +--
 25-akpm/fs/udf/balloc.c                           |    2 +-
 25-akpm/fs/ufs/balloc.c                           |    2 +-
 25-akpm/fs/ufs/cylinder.c                         |    2 +-
 25-akpm/fs/ufs/ialloc.c                           |    2 +-
 25-akpm/fs/ufs/super.c                            |    2 +-
 25-akpm/include/linux/idr.h                       |    2 +-
 25-akpm/include/linux/mtd/gen_probe.h             |    2 +-
 25-akpm/include/net/pkt_act.h                     |    2 +-
 25-akpm/kernel/rcupdate.c                         |    2 +-
 25-akpm/lib/bitmap.c                              |    2 +-
 25-akpm/net/core/dev.c                            |    2 +-
 25-akpm/net/core/dev_mcast.c                      |    2 +-
 25-akpm/net/core/link_watch.c                     |    2 +-
 25-akpm/net/core/pktgen.c                         |    2 +-
 25-akpm/net/econet/af_econet.c                    |    2 +-
 25-akpm/net/ipv4/devinet.c                        |    2 +-
 25-akpm/net/ipv4/fib_frontend.c                   |    2 +-
 25-akpm/net/ipv4/fib_hash.c                       |    2 +-
 25-akpm/net/ipv4/fib_rules.c                      |    2 +-
 25-akpm/net/ipv4/fib_semantics.c                  |    2 +-
 25-akpm/net/ipv4/route.c                          |    2 +-
 25-akpm/net/irda/irlan/irlan_client.c             |    2 +-
 25-akpm/net/irda/irlan/irlan_common.c             |    2 +-
 25-akpm/net/irda/irlan/irlan_provider.c           |    2 +-
 25-akpm/net/netlink/netlink_dev.c                 |    2 +-
 25-akpm/net/sched/act_api.c                       |    2 +-
 25-akpm/net/sched/cls_api.c                       |    2 +-
 25-akpm/net/sched/cls_fw.c                        |    2 +-
 25-akpm/net/sched/cls_route.c                     |    2 +-
 25-akpm/net/sched/cls_rsvp.c                      |    2 +-
 25-akpm/net/sched/cls_rsvp6.c                     |    2 +-
 25-akpm/net/sched/cls_u32.c                       |    2 +-
 25-akpm/net/sched/estimator.c                     |    2 +-
 25-akpm/net/sched/gact.c                          |    2 +-
 25-akpm/net/sched/police.c                        |    2 +-
 25-akpm/net/sched/sch_api.c                       |    2 +-
 25-akpm/net/sched/sch_cbq.c                       |    2 +-
 25-akpm/net/sched/sch_fifo.c                      |    2 +-
 25-akpm/net/sched/sch_generic.c                   |    2 +-
 25-akpm/net/sched/sch_gred.c                      |    2 +-
 25-akpm/net/sched/sch_htb.c                       |    2 +-
 25-akpm/net/sched/sch_netem.c                     |    2 +-
 25-akpm/net/sched/sch_prio.c                      |    2 +-
 25-akpm/net/sched/sch_red.c                       |    2 +-
 25-akpm/net/sched/sch_sfq.c                       |    2 +-
 25-akpm/net/sched/sch_tbf.c                       |    2 +-
 25-akpm/net/sched/sch_teql.c                      |    2 +-
 25-akpm/sound/pci/bt87x.c                         |    2 +-
 368 files changed, 370 insertions(+), 378 deletions(-)

diff -puN arch/alpha/kernel/irq.c~include-asm-bitopsh-include-linux-bitopsh arch/alpha/kernel/irq.c
--- 25/arch/alpha/kernel/irq.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/alpha/kernel/irq.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/alpha/kernel/signal.c~include-asm-bitopsh-include-linux-bitopsh arch/alpha/kernel/signal.c
--- 25/arch/alpha/kernel/signal.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/alpha/kernel/signal.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/alpha/kernel/smp.c~include-asm-bitopsh-include-linux-bitopsh arch/alpha/kernel/smp.c
--- 25/arch/alpha/kernel/smp.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/alpha/kernel/smp.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/alpha/kernel/sys_alcor.c~include-asm-bitopsh-include-linux-bitopsh arch/alpha/kernel/sys_alcor.c
--- 25/arch/alpha/kernel/sys_alcor.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/alpha/kernel/sys_alcor.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/alpha/kernel/sys_cabriolet.c~include-asm-bitopsh-include-linux-bitopsh arch/alpha/kernel/sys_cabriolet.c
--- 25/arch/alpha/kernel/sys_cabriolet.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/alpha/kernel/sys_cabriolet.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/alpha/kernel/sys_dp264.c~include-asm-bitopsh-include-linux-bitopsh arch/alpha/kernel/sys_dp264.c
--- 25/arch/alpha/kernel/sys_dp264.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/alpha/kernel/sys_dp264.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/alpha/kernel/sys_eb64p.c~include-asm-bitopsh-include-linux-bitopsh arch/alpha/kernel/sys_eb64p.c
--- 25/arch/alpha/kernel/sys_eb64p.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/alpha/kernel/sys_eb64p.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/alpha/kernel/sys_eiger.c~include-asm-bitopsh-include-linux-bitopsh arch/alpha/kernel/sys_eiger.c
--- 25/arch/alpha/kernel/sys_eiger.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/alpha/kernel/sys_eiger.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/alpha/kernel/sys_marvel.c~include-asm-bitopsh-include-linux-bitopsh arch/alpha/kernel/sys_marvel.c
--- 25/arch/alpha/kernel/sys_marvel.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/alpha/kernel/sys_marvel.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/alpha/kernel/sys_mikasa.c~include-asm-bitopsh-include-linux-bitopsh arch/alpha/kernel/sys_mikasa.c
--- 25/arch/alpha/kernel/sys_mikasa.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/alpha/kernel/sys_mikasa.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/alpha/kernel/sys_nautilus.c~include-asm-bitopsh-include-linux-bitopsh arch/alpha/kernel/sys_nautilus.c
--- 25/arch/alpha/kernel/sys_nautilus.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/alpha/kernel/sys_nautilus.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/alpha/kernel/sys_noritake.c~include-asm-bitopsh-include-linux-bitopsh arch/alpha/kernel/sys_noritake.c
--- 25/arch/alpha/kernel/sys_noritake.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/alpha/kernel/sys_noritake.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/alpha/kernel/sys_rx164.c~include-asm-bitopsh-include-linux-bitopsh arch/alpha/kernel/sys_rx164.c
--- 25/arch/alpha/kernel/sys_rx164.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/alpha/kernel/sys_rx164.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/alpha/kernel/sys_sx164.c~include-asm-bitopsh-include-linux-bitopsh arch/alpha/kernel/sys_sx164.c
--- 25/arch/alpha/kernel/sys_sx164.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/alpha/kernel/sys_sx164.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/alpha/kernel/sys_titan.c~include-asm-bitopsh-include-linux-bitopsh arch/alpha/kernel/sys_titan.c
--- 25/arch/alpha/kernel/sys_titan.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/alpha/kernel/sys_titan.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/alpha/kernel/sys_wildfire.c~include-asm-bitopsh-include-linux-bitopsh arch/alpha/kernel/sys_wildfire.c
--- 25/arch/alpha/kernel/sys_wildfire.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/alpha/kernel/sys_wildfire.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/arm26/machine/small_page.c~include-asm-bitopsh-include-linux-bitopsh arch/arm26/machine/small_page.c
--- 25/arch/arm26/machine/small_page.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/arm26/machine/small_page.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/arm/vfp/vfpdouble.c~include-asm-bitopsh-include-linux-bitopsh arch/arm/vfp/vfpdouble.c
--- 25/arch/arm/vfp/vfpdouble.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/arm/vfp/vfpdouble.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/arm/vfp/vfpsingle.c~include-asm-bitopsh-include-linux-bitopsh arch/arm/vfp/vfpsingle.c
--- 25/arch/arm/vfp/vfpsingle.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/arm/vfp/vfpsingle.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/cris/arch-v10/drivers/ethernet.c~include-asm-bitopsh-include-linux-bitopsh arch/cris/arch-v10/drivers/ethernet.c
--- 25/arch/cris/arch-v10/drivers/ethernet.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/cris/arch-v10/drivers/ethernet.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/cris/arch-v10/drivers/serial.c~include-asm-bitopsh-include-linux-bitopsh arch/cris/arch-v10/drivers/serial.c
--- 25/arch/cris/arch-v10/drivers/serial.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/cris/arch-v10/drivers/serial.c	Thu Oct  7 14:46:47 2004
@@ -435,7 +435,7 @@ static char *serial_version = "$Revision
 #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 -puN arch/cris/kernel/irq.c~include-asm-bitopsh-include-linux-bitopsh arch/cris/kernel/irq.c
--- 25/arch/cris/kernel/irq.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/cris/kernel/irq.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/i386/kernel/i8259.c~include-asm-bitopsh-include-linux-bitopsh arch/i386/kernel/i8259.c
--- 25/arch/i386/kernel/i8259.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/i386/kernel/i8259.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/ia64/hp/common/sba_iommu.c~include-asm-bitopsh-include-linux-bitopsh arch/ia64/hp/common/sba_iommu.c
--- 25/arch/ia64/hp/common/sba_iommu.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/ia64/hp/common/sba_iommu.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/ia64/hp/sim/simeth.c~include-asm-bitopsh-include-linux-bitopsh arch/ia64/hp/sim/simeth.c
--- 25/arch/ia64/hp/sim/simeth.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/ia64/hp/sim/simeth.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/ia64/kernel/irq.c~include-asm-bitopsh-include-linux-bitopsh arch/ia64/kernel/irq.c
--- 25/arch/ia64/kernel/irq.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/ia64/kernel/irq.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/ia64/kernel/irq_ia64.c~include-asm-bitopsh-include-linux-bitopsh arch/ia64/kernel/irq_ia64.c
--- 25/arch/ia64/kernel/irq_ia64.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/ia64/kernel/irq_ia64.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/ia64/kernel/perfmon.c~include-asm-bitopsh-include-linux-bitopsh arch/ia64/kernel/perfmon.c
--- 25/arch/ia64/kernel/perfmon.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/ia64/kernel/perfmon.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/ia64/kernel/smpboot.c~include-asm-bitopsh-include-linux-bitopsh arch/ia64/kernel/smpboot.c
--- 25/arch/ia64/kernel/smpboot.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/ia64/kernel/smpboot.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/ia64/kernel/smp.c~include-asm-bitopsh-include-linux-bitopsh arch/ia64/kernel/smp.c
--- 25/arch/ia64/kernel/smp.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/ia64/kernel/smp.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/ia64/lib/bitop.c~include-asm-bitopsh-include-linux-bitopsh arch/ia64/lib/bitop.c
--- 25/arch/ia64/lib/bitop.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/ia64/lib/bitop.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/ia64/mm/init.c~include-asm-bitopsh-include-linux-bitopsh arch/ia64/mm/init.c
--- 25/arch/ia64/mm/init.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/ia64/mm/init.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/ia64/sn/kernel/irq.c~include-asm-bitopsh-include-linux-bitopsh arch/ia64/sn/kernel/irq.c
--- 25/arch/ia64/sn/kernel/irq.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/ia64/sn/kernel/irq.c	Thu Oct  7 14:46:47 2004
@@ -16,6 +16,7 @@
 #include <linux/slab.h>
 #include <linux/bootmem.h>
 #include <linux/cpumask.h>
+#include <linux/bitops.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
 #include <asm/sn/sgi.h>
@@ -34,7 +35,6 @@
 #include <asm/sn/pda.h>
 #include <asm/processor.h>
 #include <asm/system.h>
-#include <asm/bitops.h>
 #include <asm/sn/sn2/shub_mmr.h>
 
 static void force_interrupt(int irq);
diff -puN arch/ia64/sn/kernel/sn2/sn2_smp.c~include-asm-bitopsh-include-linux-bitopsh arch/ia64/sn/kernel/sn2/sn2_smp.c
--- 25/arch/ia64/sn/kernel/sn2/sn2_smp.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/ia64/sn/kernel/sn2/sn2_smp.c	Thu Oct  7 14:46:47 2004
@@ -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>
@@ -29,7 +30,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 -puN arch/m32r/kernel/irq.c~include-asm-bitopsh-include-linux-bitopsh arch/m32r/kernel/irq.c
--- 25/arch/m32r/kernel/irq.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/m32r/kernel/irq.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/m32r/mm/init.c~include-asm-bitopsh-include-linux-bitopsh arch/m32r/mm/init.c
--- 25/arch/m32r/mm/init.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/m32r/mm/init.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/m68k/sun3/mmu_emu.c~include-asm-bitopsh-include-linux-bitopsh arch/m68k/sun3/mmu_emu.c
--- 25/arch/m68k/sun3/mmu_emu.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/m68k/sun3/mmu_emu.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/mips/au1000/common/au1xxx_irqmap.c~include-asm-bitopsh-include-linux-bitopsh arch/mips/au1000/common/au1xxx_irqmap.c
--- 25/arch/mips/au1000/common/au1xxx_irqmap.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/mips/au1000/common/au1xxx_irqmap.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/mips/au1000/common/irq.c~include-asm-bitopsh-include-linux-bitopsh arch/mips/au1000/common/irq.c
--- 25/arch/mips/au1000/common/irq.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/mips/au1000/common/irq.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/mips/au1000/csb250/irqmap.c~include-asm-bitopsh-include-linux-bitopsh arch/mips/au1000/csb250/irqmap.c
--- 25/arch/mips/au1000/csb250/irqmap.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/mips/au1000/csb250/irqmap.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/mips/au1000/db1x00/irqmap.c~include-asm-bitopsh-include-linux-bitopsh arch/mips/au1000/db1x00/irqmap.c
--- 25/arch/mips/au1000/db1x00/irqmap.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/mips/au1000/db1x00/irqmap.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/mips/au1000/hydrogen3/irqmap.c~include-asm-bitopsh-include-linux-bitopsh arch/mips/au1000/hydrogen3/irqmap.c
--- 25/arch/mips/au1000/hydrogen3/irqmap.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/mips/au1000/hydrogen3/irqmap.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/mips/au1000/mtx-1/irqmap.c~include-asm-bitopsh-include-linux-bitopsh arch/mips/au1000/mtx-1/irqmap.c
--- 25/arch/mips/au1000/mtx-1/irqmap.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/mips/au1000/mtx-1/irqmap.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/mips/au1000/pb1000/irqmap.c~include-asm-bitopsh-include-linux-bitopsh arch/mips/au1000/pb1000/irqmap.c
--- 25/arch/mips/au1000/pb1000/irqmap.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/mips/au1000/pb1000/irqmap.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/mips/au1000/pb1100/irqmap.c~include-asm-bitopsh-include-linux-bitopsh arch/mips/au1000/pb1100/irqmap.c
--- 25/arch/mips/au1000/pb1100/irqmap.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/mips/au1000/pb1100/irqmap.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/mips/au1000/pb1500/irqmap.c~include-asm-bitopsh-include-linux-bitopsh arch/mips/au1000/pb1500/irqmap.c
--- 25/arch/mips/au1000/pb1500/irqmap.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/mips/au1000/pb1500/irqmap.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/mips/au1000/pb1550/irqmap.c~include-asm-bitopsh-include-linux-bitopsh arch/mips/au1000/pb1550/irqmap.c
--- 25/arch/mips/au1000/pb1550/irqmap.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/mips/au1000/pb1550/irqmap.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/mips/au1000/xxs1500/irqmap.c~include-asm-bitopsh-include-linux-bitopsh arch/mips/au1000/xxs1500/irqmap.c
--- 25/arch/mips/au1000/xxs1500/irqmap.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/mips/au1000/xxs1500/irqmap.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/mips/baget/irq.c~include-asm-bitopsh-include-linux-bitopsh arch/mips/baget/irq.c
--- 25/arch/mips/baget/irq.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/mips/baget/irq.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/mips/gt64120/ev64120/irq.c~include-asm-bitopsh-include-linux-bitopsh arch/mips/gt64120/ev64120/irq.c
--- 25/arch/mips/gt64120/ev64120/irq.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/mips/gt64120/ev64120/irq.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/mips/gt64120/momenco_ocelot/irq.c~include-asm-bitopsh-include-linux-bitopsh arch/mips/gt64120/momenco_ocelot/irq.c
--- 25/arch/mips/gt64120/momenco_ocelot/irq.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/mips/gt64120/momenco_ocelot/irq.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/mips/ite-boards/generic/irq.c~include-asm-bitopsh-include-linux-bitopsh arch/mips/ite-boards/generic/irq.c
--- 25/arch/mips/ite-boards/generic/irq.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/mips/ite-boards/generic/irq.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/mips/jmr3927/rbhma3100/irq.c~include-asm-bitopsh-include-linux-bitopsh arch/mips/jmr3927/rbhma3100/irq.c
--- 25/arch/mips/jmr3927/rbhma3100/irq.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/mips/jmr3927/rbhma3100/irq.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/mips/kernel/signal32.c~include-asm-bitopsh-include-linux-bitopsh arch/mips/kernel/signal32.c
--- 25/arch/mips/kernel/signal32.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/mips/kernel/signal32.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/mips/kernel/signal.c~include-asm-bitopsh-include-linux-bitopsh arch/mips/kernel/signal.c
--- 25/arch/mips/kernel/signal.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/mips/kernel/signal.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/mips/kernel/signal_n32.c~include-asm-bitopsh-include-linux-bitopsh arch/mips/kernel/signal_n32.c
--- 25/arch/mips/kernel/signal_n32.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/mips/kernel/signal_n32.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/mips/momentum/ocelot_c/irq.c~include-asm-bitopsh-include-linux-bitopsh arch/mips/momentum/ocelot_c/irq.c
--- 25/arch/mips/momentum/ocelot_c/irq.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/mips/momentum/ocelot_c/irq.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/mips/momentum/ocelot_g/irq.c~include-asm-bitopsh-include-linux-bitopsh arch/mips/momentum/ocelot_g/irq.c
--- 25/arch/mips/momentum/ocelot_g/irq.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/mips/momentum/ocelot_g/irq.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/mips/pmc-sierra/yosemite/irq.c~include-asm-bitopsh-include-linux-bitopsh arch/mips/pmc-sierra/yosemite/irq.c
--- 25/arch/mips/pmc-sierra/yosemite/irq.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/mips/pmc-sierra/yosemite/irq.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/mips/sgi-ip27/ip27-irq.c~include-asm-bitopsh-include-linux-bitopsh arch/mips/sgi-ip27/ip27-irq.c
--- 25/arch/mips/sgi-ip27/ip27-irq.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/mips/sgi-ip27/ip27-irq.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/mips/sgi-ip32/ip32-irq.c~include-asm-bitopsh-include-linux-bitopsh arch/mips/sgi-ip32/ip32-irq.c
--- 25/arch/mips/sgi-ip32/ip32-irq.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/mips/sgi-ip32/ip32-irq.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/mips/tx4927/common/tx4927_irq.c~include-asm-bitopsh-include-linux-bitopsh arch/mips/tx4927/common/tx4927_irq.c
--- 25/arch/mips/tx4927/common/tx4927_irq.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/mips/tx4927/common/tx4927_irq.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/mips/tx4927/common/tx4927_setup.c~include-asm-bitopsh-include-linux-bitopsh arch/mips/tx4927/common/tx4927_setup.c
--- 25/arch/mips/tx4927/common/tx4927_setup.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/mips/tx4927/common/tx4927_setup.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/parisc/kernel/smp.c~include-asm-bitopsh-include-linux-bitopsh arch/parisc/kernel/smp.c
--- 25/arch/parisc/kernel/smp.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/parisc/kernel/smp.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/ppc/4xx_io/serial_sicc.c~include-asm-bitopsh-include-linux-bitopsh arch/ppc/4xx_io/serial_sicc.c
--- 25/arch/ppc/4xx_io/serial_sicc.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/ppc/4xx_io/serial_sicc.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/ppc64/kernel/bitops.c~include-asm-bitopsh-include-linux-bitopsh arch/ppc64/kernel/bitops.c
--- 25/arch/ppc64/kernel/bitops.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/ppc64/kernel/bitops.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/ppc64/kernel/iommu.c~include-asm-bitopsh-include-linux-bitopsh arch/ppc64/kernel/iommu.c
--- 25/arch/ppc64/kernel/iommu.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/ppc64/kernel/iommu.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/ppc64/kernel/irq.c~include-asm-bitopsh-include-linux-bitopsh arch/ppc64/kernel/irq.c
--- 25/arch/ppc64/kernel/irq.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/ppc64/kernel/irq.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/ppc64/kernel/lmb.c~include-asm-bitopsh-include-linux-bitopsh arch/ppc64/kernel/lmb.c
--- 25/arch/ppc64/kernel/lmb.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/ppc64/kernel/lmb.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/ppc64/kernel/LparData.c~include-asm-bitopsh-include-linux-bitopsh arch/ppc64/kernel/LparData.c
--- 25/arch/ppc64/kernel/LparData.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/ppc64/kernel/LparData.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/ppc64/kernel/pmac_setup.c~include-asm-bitopsh-include-linux-bitopsh arch/ppc64/kernel/pmac_setup.c
--- 25/arch/ppc64/kernel/pmac_setup.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/ppc64/kernel/pmac_setup.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/ppc64/kernel/ppc_ksyms.c~include-asm-bitopsh-include-linux-bitopsh arch/ppc64/kernel/ppc_ksyms.c
--- 25/arch/ppc64/kernel/ppc_ksyms.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/ppc64/kernel/ppc_ksyms.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/ppc64/kernel/prom.c~include-asm-bitopsh-include-linux-bitopsh arch/ppc64/kernel/prom.c
--- 25/arch/ppc64/kernel/prom.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/ppc64/kernel/prom.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/ppc64/kernel/prom_init.c~include-asm-bitopsh-include-linux-bitopsh arch/ppc64/kernel/prom_init.c
--- 25/arch/ppc64/kernel/prom_init.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/ppc64/kernel/prom_init.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/ppc64/kernel/ras.c~include-asm-bitopsh-include-linux-bitopsh arch/ppc64/kernel/ras.c
--- 25/arch/ppc64/kernel/ras.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/ppc64/kernel/ras.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/ppc64/kernel/rtas-proc.c~include-asm-bitopsh-include-linux-bitopsh arch/ppc64/kernel/rtas-proc.c
--- 25/arch/ppc64/kernel/rtas-proc.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/ppc64/kernel/rtas-proc.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/ppc/8260_io/enet.c~include-asm-bitopsh-include-linux-bitopsh arch/ppc/8260_io/enet.c
--- 25/arch/ppc/8260_io/enet.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/ppc/8260_io/enet.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/ppc/8260_io/fcc_enet.c~include-asm-bitopsh-include-linux-bitopsh arch/ppc/8260_io/fcc_enet.c
--- 25/arch/ppc/8260_io/fcc_enet.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/ppc/8260_io/fcc_enet.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/ppc/8xx_io/enet.c~include-asm-bitopsh-include-linux-bitopsh arch/ppc/8xx_io/enet.c
--- 25/arch/ppc/8xx_io/enet.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/ppc/8xx_io/enet.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/ppc/8xx_io/fec.c~include-asm-bitopsh-include-linux-bitopsh arch/ppc/8xx_io/fec.c
--- 25/arch/ppc/8xx_io/fec.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/ppc/8xx_io/fec.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/ppc/kernel/bitops.c~include-asm-bitopsh-include-linux-bitopsh arch/ppc/kernel/bitops.c
--- 25/arch/ppc/kernel/bitops.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/ppc/kernel/bitops.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/ppc/kernel/irq.c~include-asm-bitopsh-include-linux-bitopsh arch/ppc/kernel/irq.c
--- 25/arch/ppc/kernel/irq.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/ppc/kernel/irq.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/ppc/kernel/ppc_htab.c~include-asm-bitopsh-include-linux-bitopsh arch/ppc/kernel/ppc_htab.c
--- 25/arch/ppc/kernel/ppc_htab.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/ppc/kernel/ppc_htab.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/ppc/kernel/ppc_ksyms.c~include-asm-bitopsh-include-linux-bitopsh arch/ppc/kernel/ppc_ksyms.c
--- 25/arch/ppc/kernel/ppc_ksyms.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/ppc/kernel/ppc_ksyms.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/ppc/platforms/pmac_setup.c~include-asm-bitopsh-include-linux-bitopsh arch/ppc/platforms/pmac_setup.c
--- 25/arch/ppc/platforms/pmac_setup.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/ppc/platforms/pmac_setup.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/ppc/syslib/prom.c~include-asm-bitopsh-include-linux-bitopsh arch/ppc/syslib/prom.c
--- 25/arch/ppc/syslib/prom.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/ppc/syslib/prom.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/ppc/syslib/prom_init.c~include-asm-bitopsh-include-linux-bitopsh arch/ppc/syslib/prom_init.c
--- 25/arch/ppc/syslib/prom_init.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/ppc/syslib/prom_init.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/ppc/xmon/start.c~include-asm-bitopsh-include-linux-bitopsh arch/ppc/xmon/start.c
--- 25/arch/ppc/xmon/start.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/ppc/xmon/start.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/ppc/xmon/xmon.c~include-asm-bitopsh-include-linux-bitopsh arch/ppc/xmon/xmon.c
--- 25/arch/ppc/xmon/xmon.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/ppc/xmon/xmon.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/sh64/kernel/irq.c~include-asm-bitopsh-include-linux-bitopsh arch/sh64/kernel/irq.c
--- 25/arch/sh64/kernel/irq.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/sh64/kernel/irq.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/sh64/kernel/irq_intc.c~include-asm-bitopsh-include-linux-bitopsh arch/sh64/kernel/irq_intc.c
--- 25/arch/sh64/kernel/irq_intc.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/sh64/kernel/irq_intc.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/sh/boards/bigsur/irq.c~include-asm-bitopsh-include-linux-bitopsh arch/sh/boards/bigsur/irq.c
--- 25/arch/sh/boards/bigsur/irq.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/sh/boards/bigsur/irq.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/sh/boards/bigsur/setup.c~include-asm-bitopsh-include-linux-bitopsh arch/sh/boards/bigsur/setup.c
--- 25/arch/sh/boards/bigsur/setup.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/sh/boards/bigsur/setup.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/sh/kernel/cpu/irq_imask.c~include-asm-bitopsh-include-linux-bitopsh arch/sh/kernel/cpu/irq_imask.c
--- 25/arch/sh/kernel/cpu/irq_imask.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/sh/kernel/cpu/irq_imask.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/sh/kernel/irq.c~include-asm-bitopsh-include-linux-bitopsh arch/sh/kernel/irq.c
--- 25/arch/sh/kernel/irq.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/sh/kernel/irq.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/sparc64/kernel/signal32.c~include-asm-bitopsh-include-linux-bitopsh arch/sparc64/kernel/signal32.c
--- 25/arch/sparc64/kernel/signal32.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/sparc64/kernel/signal32.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/sparc64/kernel/signal.c~include-asm-bitopsh-include-linux-bitopsh arch/sparc64/kernel/signal.c
--- 25/arch/sparc64/kernel/signal.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/sparc64/kernel/signal.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/sparc64/kernel/unaligned.c~include-asm-bitopsh-include-linux-bitopsh arch/sparc64/kernel/unaligned.c
--- 25/arch/sparc64/kernel/unaligned.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/sparc64/kernel/unaligned.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/sparc64/lib/find_bit.c~include-asm-bitopsh-include-linux-bitopsh arch/sparc64/lib/find_bit.c
--- 25/arch/sparc64/lib/find_bit.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/sparc64/lib/find_bit.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/sparc/kernel/signal.c~include-asm-bitopsh-include-linux-bitopsh arch/sparc/kernel/signal.c
--- 25/arch/sparc/kernel/signal.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/sparc/kernel/signal.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/sparc/lib/bitext.c~include-asm-bitopsh-include-linux-bitopsh arch/sparc/lib/bitext.c
--- 25/arch/sparc/lib/bitext.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/sparc/lib/bitext.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/sparc/mm/io-unit.c~include-asm-bitopsh-include-linux-bitopsh arch/sparc/mm/io-unit.c
--- 25/arch/sparc/mm/io-unit.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/sparc/mm/io-unit.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/v850/kernel/fpga85e2c.c~include-asm-bitopsh-include-linux-bitopsh arch/v850/kernel/fpga85e2c.c
--- 25/arch/v850/kernel/fpga85e2c.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/v850/kernel/fpga85e2c.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/x86_64/kernel/i8259.c~include-asm-bitopsh-include-linux-bitopsh arch/x86_64/kernel/i8259.c
--- 25/arch/x86_64/kernel/i8259.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/x86_64/kernel/i8259.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/x86_64/kernel/pci-gart.c~include-asm-bitopsh-include-linux-bitopsh arch/x86_64/kernel/pci-gart.c
--- 25/arch/x86_64/kernel/pci-gart.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/x86_64/kernel/pci-gart.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/x86_64/kernel/setup64.c~include-asm-bitopsh-include-linux-bitopsh arch/x86_64/kernel/setup64.c
--- 25/arch/x86_64/kernel/setup64.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/x86_64/kernel/setup64.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/x86_64/lib/bitops.c~include-asm-bitopsh-include-linux-bitopsh arch/x86_64/lib/bitops.c
--- 25/arch/x86_64/lib/bitops.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/x86_64/lib/bitops.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN arch/x86_64/lib/bitstr.c~include-asm-bitopsh-include-linux-bitopsh arch/x86_64/lib/bitstr.c
--- 25/arch/x86_64/lib/bitstr.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/arch/x86_64/lib/bitstr.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN Documentation/DocBook/kernel-hacking.tmpl~include-asm-bitopsh-include-linux-bitopsh Documentation/DocBook/kernel-hacking.tmpl
--- 25/Documentation/DocBook/kernel-hacking.tmpl~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/Documentation/DocBook/kernel-hacking.tmpl	Thu Oct  7 14:46:47 2004
@@ -888,7 +888,7 @@ printk(KERN_INFO "my ip: %d.%d.%d.%d\n",
    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 -puN drivers/acorn/block/fd1772.c~include-asm-bitopsh-include-linux-bitopsh drivers/acorn/block/fd1772.c
--- 25/drivers/acorn/block/fd1772.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/acorn/block/fd1772.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/block/z2ram.c~include-asm-bitopsh-include-linux-bitopsh drivers/block/z2ram.c
--- 25/drivers/block/z2ram.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/block/z2ram.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/bluetooth/bt3c_cs.c~include-asm-bitopsh-include-linux-bitopsh drivers/bluetooth/bt3c_cs.c
--- 25/drivers/bluetooth/bt3c_cs.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/bluetooth/bt3c_cs.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/bluetooth/btuart_cs.c~include-asm-bitopsh-include-linux-bitopsh drivers/bluetooth/btuart_cs.c
--- 25/drivers/bluetooth/btuart_cs.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/bluetooth/btuart_cs.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/bluetooth/dtl1_cs.c~include-asm-bitopsh-include-linux-bitopsh drivers/bluetooth/dtl1_cs.c
--- 25/drivers/bluetooth/dtl1_cs.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/bluetooth/dtl1_cs.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/char/amiserial.c~include-asm-bitopsh-include-linux-bitopsh drivers/char/amiserial.c
--- 25/drivers/char/amiserial.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/char/amiserial.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/char/cyclades.c~include-asm-bitopsh-include-linux-bitopsh drivers/char/cyclades.c
--- 25/drivers/char/cyclades.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/char/cyclades.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/char/ec3104_keyb.c~include-asm-bitopsh-include-linux-bitopsh drivers/char/ec3104_keyb.c
--- 25/drivers/char/ec3104_keyb.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/char/ec3104_keyb.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/char/hpet.c~include-asm-bitopsh-include-linux-bitopsh drivers/char/hpet.c
--- 25/drivers/char/hpet.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/char/hpet.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/char/ip2main.c~include-asm-bitopsh-include-linux-bitopsh drivers/char/ip2main.c
--- 25/drivers/char/ip2main.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/char/ip2main.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/char/moxa.c~include-asm-bitopsh-include-linux-bitopsh drivers/char/moxa.c
--- 25/drivers/char/moxa.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/char/moxa.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/char/mwave/3780i.c~include-asm-bitopsh-include-linux-bitopsh drivers/char/mwave/3780i.c
--- 25/drivers/char/mwave/3780i.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/char/mwave/3780i.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/char/n_hdlc.c~include-asm-bitopsh-include-linux-bitopsh drivers/char/n_hdlc.c
--- 25/drivers/char/n_hdlc.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/char/n_hdlc.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/char/n_tty.c~include-asm-bitopsh-include-linux-bitopsh drivers/char/n_tty.c
--- 25/drivers/char/n_tty.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/char/n_tty.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/char/pcmcia/synclink_cs.c~include-asm-bitopsh-include-linux-bitopsh drivers/char/pcmcia/synclink_cs.c
--- 25/drivers/char/pcmcia/synclink_cs.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/char/pcmcia/synclink_cs.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/char/pcxx.c~include-asm-bitopsh-include-linux-bitopsh drivers/char/pcxx.c
--- 25/drivers/char/pcxx.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/char/pcxx.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/char/pty.c~include-asm-bitopsh-include-linux-bitopsh drivers/char/pty.c
--- 25/drivers/char/pty.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/char/pty.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/char/qtronix.c~include-asm-bitopsh-include-linux-bitopsh drivers/char/qtronix.c
--- 25/drivers/char/qtronix.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/char/qtronix.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/char/rocket.c~include-asm-bitopsh-include-linux-bitopsh drivers/char/rocket.c
--- 25/drivers/char/rocket.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/char/rocket.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/char/serial167.c~include-asm-bitopsh-include-linux-bitopsh drivers/char/serial167.c
--- 25/drivers/char/serial167.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/char/serial167.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/char/synclink.c~include-asm-bitopsh-include-linux-bitopsh drivers/char/synclink.c
--- 25/drivers/char/synclink.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/char/synclink.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/char/synclinkmp.c~include-asm-bitopsh-include-linux-bitopsh drivers/char/synclinkmp.c
--- 25/drivers/char/synclinkmp.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/char/synclinkmp.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/char/tipar.c~include-asm-bitopsh-include-linux-bitopsh drivers/char/tipar.c
--- 25/drivers/char/tipar.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/char/tipar.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/char/tty_io.c~include-asm-bitopsh-include-linux-bitopsh drivers/char/tty_io.c
--- 25/drivers/char/tty_io.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/char/tty_io.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/char/tty_ioctl.c~include-asm-bitopsh-include-linux-bitopsh drivers/char/tty_ioctl.c
--- 25/drivers/char/tty_ioctl.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/char/tty_ioctl.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/char/vt.c~include-asm-bitopsh-include-linux-bitopsh drivers/char/vt.c
--- 25/drivers/char/vt.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/char/vt.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/char/watchdog/ixp2000_wdt.c~include-asm-bitopsh-include-linux-bitopsh drivers/char/watchdog/ixp2000_wdt.c
--- 25/drivers/char/watchdog/ixp2000_wdt.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/char/watchdog/ixp2000_wdt.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/char/watchdog/ixp4xx_wdt.c~include-asm-bitopsh-include-linux-bitopsh drivers/char/watchdog/ixp4xx_wdt.c
--- 25/drivers/char/watchdog/ixp4xx_wdt.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/char/watchdog/ixp4xx_wdt.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/fc4/socal.c~include-asm-bitopsh-include-linux-bitopsh drivers/fc4/socal.c
--- 25/drivers/fc4/socal.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/fc4/socal.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/fc4/soc.c~include-asm-bitopsh-include-linux-bitopsh drivers/fc4/soc.c
--- 25/drivers/fc4/soc.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/fc4/soc.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/ide/ide.c~include-asm-bitopsh-include-linux-bitopsh drivers/ide/ide.c
--- 25/drivers/ide/ide.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/ide/ide.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/ide/ide-default.c~include-asm-bitopsh-include-linux-bitopsh drivers/ide/ide-default.c
--- 25/drivers/ide/ide-default.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/ide/ide-default.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/ide/ide-floppy.c~include-asm-bitopsh-include-linux-bitopsh drivers/ide/ide-floppy.c
--- 25/drivers/ide/ide-floppy.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/ide/ide-floppy.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/ide/ide-iops.c~include-asm-bitopsh-include-linux-bitopsh drivers/ide/ide-iops.c
--- 25/drivers/ide/ide-iops.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/ide/ide-iops.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/ide/ide-lib.c~include-asm-bitopsh-include-linux-bitopsh drivers/ide/ide-lib.c
--- 25/drivers/ide/ide-lib.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/ide/ide-lib.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/ide/ide-tape.c~include-asm-bitopsh-include-linux-bitopsh drivers/ide/ide-tape.c
--- 25/drivers/ide/ide-tape.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/ide/ide-tape.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/ide/ide-taskfile.c~include-asm-bitopsh-include-linux-bitopsh drivers/ide/ide-taskfile.c
--- 25/drivers/ide/ide-taskfile.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/ide/ide-taskfile.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/input/serio/q40kbd.c~include-asm-bitopsh-include-linux-bitopsh drivers/input/serio/q40kbd.c
--- 25/drivers/input/serio/q40kbd.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/input/serio/q40kbd.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/isdn/i4l/isdn_bsdcomp.c~include-asm-bitopsh-include-linux-bitopsh drivers/isdn/i4l/isdn_bsdcomp.c
--- 25/drivers/isdn/i4l/isdn_bsdcomp.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/isdn/i4l/isdn_bsdcomp.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/macintosh/macserial.c~include-asm-bitopsh-include-linux-bitopsh drivers/macintosh/macserial.c
--- 25/drivers/macintosh/macserial.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/macintosh/macserial.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/md/raid5.c~include-asm-bitopsh-include-linux-bitopsh drivers/md/raid5.c
--- 25/drivers/md/raid5.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/md/raid5.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/md/raid6main.c~include-asm-bitopsh-include-linux-bitopsh drivers/md/raid6main.c
--- 25/drivers/md/raid6main.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/md/raid6main.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/media/dvb/bt8xx/dvb-bt8xx.c~include-asm-bitopsh-include-linux-bitopsh drivers/media/dvb/bt8xx/dvb-bt8xx.c
--- 25/drivers/media/dvb/bt8xx/dvb-bt8xx.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/media/dvb/bt8xx/dvb-bt8xx.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/media/dvb/frontends/at76c651.c~include-asm-bitopsh-include-linux-bitopsh drivers/media/dvb/frontends/at76c651.c
--- 25/drivers/media/dvb/frontends/at76c651.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/media/dvb/frontends/at76c651.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/media/dvb/ttpci/av7110_ir.c~include-asm-bitopsh-include-linux-bitopsh drivers/media/dvb/ttpci/av7110_ir.c
--- 25/drivers/media/dvb/ttpci/av7110_ir.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/media/dvb/ttpci/av7110_ir.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/3c501.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/3c501.c
--- 25/drivers/net/3c501.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/3c501.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/3c505.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/3c505.c
--- 25/drivers/net/3c505.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/3c505.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/3c507.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/3c507.c
--- 25/drivers/net/3c507.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/3c507.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/3c509.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/3c509.c
--- 25/drivers/net/3c509.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/3c509.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/3c515.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/3c515.c
--- 25/drivers/net/3c515.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/3c515.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/3c523.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/3c523.c
--- 25/drivers/net/3c523.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/3c523.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/3c527.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/3c527.c
--- 25/drivers/net/3c527.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/3c527.c	Thu Oct  7 14:46:47 2004
@@ -102,11 +102,11 @@ DRV_NAME ".c:v" DRV_VERSION " " DRV_RELD
 #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 -puN drivers/net/3c59x.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/3c59x.c
--- 25/drivers/net/3c59x.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/3c59x.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/7990.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/7990.c
--- 25/drivers/net/7990.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/7990.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/82596.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/82596.c
--- 25/drivers/net/82596.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/82596.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/8390.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/8390.c
--- 25/drivers/net/8390.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/8390.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/a2065.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/a2065.c
--- 25/drivers/net/a2065.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/a2065.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/appletalk/cops.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/appletalk/cops.c
--- 25/drivers/net/appletalk/cops.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/appletalk/cops.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/appletalk/ltpc.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/appletalk/ltpc.c
--- 25/drivers/net/appletalk/ltpc.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/appletalk/ltpc.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/ariadne.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/ariadne.c
--- 25/drivers/net/ariadne.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/ariadne.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/arm/am79c961a.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/arm/am79c961a.c
--- 25/drivers/net/arm/am79c961a.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/arm/am79c961a.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/arm/ether1.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/arm/ether1.c
--- 25/drivers/net/arm/ether1.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/arm/ether1.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/arm/ether3.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/arm/ether3.c
--- 25/drivers/net/arm/ether3.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/arm/ether3.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/arm/etherh.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/arm/etherh.c
--- 25/drivers/net/arm/etherh.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/arm/etherh.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/at1700.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/at1700.c
--- 25/drivers/net/at1700.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/at1700.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/atari_bionet.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/atari_bionet.c
--- 25/drivers/net/atari_bionet.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/atari_bionet.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/atarilance.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/atarilance.c
--- 25/drivers/net/atarilance.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/atarilance.c	Thu Oct  7 14:46:47 2004
@@ -56,12 +56,12 @@ static char version[] = "atarilance.c: v
 #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 -puN drivers/net/atari_pamsnet.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/atari_pamsnet.c
--- 25/drivers/net/atari_pamsnet.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/atari_pamsnet.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/atp.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/atp.c
--- 25/drivers/net/atp.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/atp.c	Thu Oct  7 14:46:47 2004
@@ -141,9 +141,9 @@ static int xcvr[NUM_UNITS]; 			/* The da
 #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 -puN drivers/net/au1000_eth.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/au1000_eth.c
--- 25/drivers/net/au1000_eth.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/au1000_eth.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/bagetlance.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/bagetlance.c
--- 25/drivers/net/bagetlance.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/bagetlance.c	Thu Oct  7 14:46:47 2004
@@ -25,9 +25,9 @@ static char *version = "bagetlance.c: v1
 #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 -puN drivers/net/bonding/bond_main.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/bonding/bond_main.c
--- 25/drivers/net/bonding/bond_main.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/bonding/bond_main.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/cs89x0.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/cs89x0.c
--- 25/drivers/net/cs89x0.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/cs89x0.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/defxx.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/defxx.c
--- 25/drivers/net/defxx.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/defxx.c	Thu Oct  7 14:46:47 2004
@@ -208,9 +208,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 -puN drivers/net/depca.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/depca.c
--- 25/drivers/net/depca.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/depca.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/dgrs.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/dgrs.c
--- 25/drivers/net/dgrs.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/dgrs.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/dl2k.h~include-asm-bitopsh-include-linux-bitopsh drivers/net/dl2k.h
--- 25/drivers/net/dl2k.h~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/dl2k.h	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/e1000/e1000.h~include-asm-bitopsh-include-linux-bitopsh drivers/net/e1000/e1000.h
--- 25/drivers/net/e1000/e1000.h~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/e1000/e1000.h	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/eepro100.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/eepro100.c
--- 25/drivers/net/eepro100.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/eepro100.c	Thu Oct  7 14:46:47 2004
@@ -102,8 +102,8 @@ static int options[] = {-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 -puN drivers/net/eepro.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/eepro.c
--- 25/drivers/net/eepro.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/eepro.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/eexpress.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/eexpress.c
--- 25/drivers/net/eexpress.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/eexpress.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/epic100.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/epic100.c
--- 25/drivers/net/epic100.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/epic100.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/eth16i.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/eth16i.c
--- 25/drivers/net/eth16i.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/eth16i.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/ewrk3.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/ewrk3.c
--- 25/drivers/net/ewrk3.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/ewrk3.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/fealnx.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/fealnx.c
--- 25/drivers/net/fealnx.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/fealnx.c	Thu Oct  7 14:46:47 2004
@@ -85,9 +85,9 @@ static int full_duplex[MAX_UNITS] = { -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 -puN drivers/net/fec_8xx/fec_8xx-netta.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/fec_8xx/fec_8xx-netta.c
--- 25/drivers/net/fec_8xx/fec_8xx-netta.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/fec_8xx/fec_8xx-netta.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/fec_8xx/fec_main.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/fec_8xx/fec_main.c
--- 25/drivers/net/fec_8xx/fec_main.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/fec_8xx/fec_main.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/fec_8xx/fec_mii.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/fec_8xx/fec_mii.c
--- 25/drivers/net/fec_8xx/fec_mii.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/fec_8xx/fec_mii.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/fec.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/fec.c
--- 25/drivers/net/fec.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/fec.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/fmv18x.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/fmv18x.c
--- 25/drivers/net/fmv18x.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/fmv18x.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/gt96100eth.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/gt96100eth.c
--- 25/drivers/net/gt96100eth.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/gt96100eth.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/hamachi.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/hamachi.c
--- 25/drivers/net/hamachi.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/hamachi.c	Thu Oct  7 14:46:47 2004
@@ -170,10 +170,10 @@ static int tx_params[MAX_UNITS] = {-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 -puN drivers/net/hamradio/6pack.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/hamradio/6pack.c
--- 25/drivers/net/hamradio/6pack.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/hamradio/6pack.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/hamradio/baycom_par.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/hamradio/baycom_par.c
--- 25/drivers/net/hamradio/baycom_par.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/hamradio/baycom_par.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/hamradio/hdlcdrv.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/hamradio/hdlcdrv.c
--- 25/drivers/net/hamradio/hdlcdrv.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/hamradio/hdlcdrv.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/hamradio/mkiss.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/hamradio/mkiss.c
--- 25/drivers/net/hamradio/mkiss.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/hamradio/mkiss.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/hamradio/scc.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/hamradio/scc.c
--- 25/drivers/net/hamradio/scc.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/hamradio/scc.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/hamradio/yam.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/hamradio/yam.c
--- 25/drivers/net/hamradio/yam.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/hamradio/yam.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/hp100.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/hp100.c
--- 25/drivers/net/hp100.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/hp100.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/hydra.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/hydra.c
--- 25/drivers/net/hydra.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/hydra.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/ibm_emac/ibm_emac_core.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/ibm_emac/ibm_emac_core.c
--- 25/drivers/net/ibm_emac/ibm_emac_core.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/ibm_emac/ibm_emac_core.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/ibmlana.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/ibmlana.c
--- 25/drivers/net/ibmlana.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/ibmlana.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/irda/au1k_ir.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/irda/au1k_ir.c
--- 25/drivers/net/irda/au1k_ir.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/irda/au1k_ir.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/irda/irport.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/irda/irport.c
--- 25/drivers/net/irda/irport.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/irda/irport.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/isa-skeleton.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/isa-skeleton.c
--- 25/drivers/net/isa-skeleton.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/isa-skeleton.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/ixgb/ixgb.h~include-asm-bitopsh-include-linux-bitopsh drivers/net/ixgb/ixgb.h
--- 25/drivers/net/ixgb/ixgb.h~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/ixgb/ixgb.h	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/jazzsonic.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/jazzsonic.c
--- 25/drivers/net/jazzsonic.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/jazzsonic.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/lance.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/lance.c
--- 25/drivers/net/lance.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/lance.c	Thu Oct  7 14:46:47 2004
@@ -56,8 +56,8 @@ static const char version[] = "lance.c:v
 #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 -puN drivers/net/lasi_82596.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/lasi_82596.c
--- 25/drivers/net/lasi_82596.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/lasi_82596.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/lp486e.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/lp486e.c
--- 25/drivers/net/lp486e.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/lp486e.c	Thu Oct  7 14:46:47 2004
@@ -70,8 +70,8 @@ All other communication is through memor
 #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 -puN drivers/net/mac8390.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/mac8390.c
--- 25/drivers/net/mac8390.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/mac8390.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/macsonic.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/macsonic.c
--- 25/drivers/net/macsonic.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/macsonic.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/mv643xx_eth.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/mv643xx_eth.c
--- 25/drivers/net/mv643xx_eth.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/mv643xx_eth.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/myri_sbus.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/myri_sbus.c
--- 25/drivers/net/myri_sbus.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/myri_sbus.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/natsemi.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/natsemi.c
--- 25/drivers/net/natsemi.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/natsemi.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/ne2.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/ne2.c
--- 25/drivers/net/ne2.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/ne2.c	Thu Oct  7 14:46:47 2004
@@ -74,9 +74,9 @@ static const char *version = "ne2.c:v0.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>
 
diff -puN drivers/net/ni5010.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/ni5010.c
--- 25/drivers/net/ni5010.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/ni5010.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/ni52.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/ni52.c
--- 25/drivers/net/ni52.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/ni52.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/ni65.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/ni65.c
--- 25/drivers/net/ni65.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/ni65.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/pcmcia/3c574_cs.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/pcmcia/3c574_cs.c
--- 25/drivers/net/pcmcia/3c574_cs.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/pcmcia/3c574_cs.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/pcmcia/3c589_cs.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/pcmcia/3c589_cs.c
--- 25/drivers/net/pcmcia/3c589_cs.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/pcmcia/3c589_cs.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/pcmcia/axnet_cs.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/pcmcia/axnet_cs.c
--- 25/drivers/net/pcmcia/axnet_cs.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/pcmcia/axnet_cs.c	Thu Oct  7 14:46:47 2004
@@ -937,7 +937,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 -puN drivers/net/pcmcia/nmclan_cs.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/pcmcia/nmclan_cs.c
--- 25/drivers/net/pcmcia/nmclan_cs.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/pcmcia/nmclan_cs.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/pcmcia/xirc2ps_cs.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/pcmcia/xirc2ps_cs.c
--- 25/drivers/net/pcmcia/xirc2ps_cs.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/pcmcia/xirc2ps_cs.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/pcnet32.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/pcnet32.c
--- 25/drivers/net/pcnet32.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/pcnet32.c	Thu Oct  7 14:46:47 2004
@@ -47,8 +47,8 @@ DRV_NAME ".c:v" DRV_VERSION " " DRV_RELD
 #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 -puN drivers/net/plip.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/plip.c
--- 25/drivers/net/plip.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/plip.c	Thu Oct  7 14:46:47 2004
@@ -109,11 +109,11 @@ static const char version[] = "NET3 PLIP
 #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 -puN drivers/net/sb1000.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/sb1000.c
--- 25/drivers/net/sb1000.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/sb1000.c	Thu Oct  7 14:46:47 2004
@@ -50,8 +50,8 @@ static char version[] = "sb1000.c:v1.1.2
 #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 -puN drivers/net/sb1250-mac.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/sb1250-mac.c
--- 25/drivers/net/sb1250-mac.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/sb1250-mac.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/seeq8005.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/seeq8005.c
--- 25/drivers/net/seeq8005.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/seeq8005.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/sgiseeq.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/sgiseeq.c
--- 25/drivers/net/sgiseeq.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/sgiseeq.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/sis900.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/sis900.c
--- 25/drivers/net/sis900.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/sis900.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/sk98lin/h/skdrv1st.h~include-asm-bitopsh-include-linux-bitopsh drivers/net/sk98lin/h/skdrv1st.h
--- 25/drivers/net/sk98lin/h/skdrv1st.h~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/sk98lin/h/skdrv1st.h	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/sk98lin/skge.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/sk98lin/skge.c
--- 25/drivers/net/sk98lin/skge.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/sk98lin/skge.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/skfp/skfddi.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/skfp/skfddi.c
--- 25/drivers/net/skfp/skfddi.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/skfp/skfddi.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/sk_g16.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/sk_g16.c
--- 25/drivers/net/sk_g16.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/sk_g16.c	Thu Oct  7 14:46:47 2004
@@ -72,10 +72,10 @@ static const char rcsid[] = "$Id: sk_g16
 #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 -puN drivers/net/sk_mca.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/sk_mca.c
--- 25/drivers/net/sk_mca.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/sk_mca.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/slip.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/slip.c
--- 25/drivers/net/slip.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/slip.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/smc9194.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/smc9194.c
--- 25/drivers/net/smc9194.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/smc9194.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/sun3_82586.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/sun3_82586.c
--- 25/drivers/net/sun3_82586.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/sun3_82586.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/sun3lance.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/sun3lance.c
--- 25/drivers/net/sun3lance.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/sun3lance.c	Thu Oct  7 14:46:47 2004
@@ -36,10 +36,10 @@ static char *version = "sun3lance.c: v1.
 #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 -puN drivers/net/sunbmac.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/sunbmac.c
--- 25/drivers/net/sunbmac.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/sunbmac.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/sundance.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/sundance.c
--- 25/drivers/net/sundance.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/sundance.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/sungem.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/sungem.c
--- 25/drivers/net/sungem.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/sungem.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/sunhme.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/sunhme.c
--- 25/drivers/net/sunhme.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/sunhme.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/sunlance.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/sunlance.c
--- 25/drivers/net/sunlance.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/sunlance.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/sunqe.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/sunqe.c
--- 25/drivers/net/sunqe.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/sunqe.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/tc35815.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/tc35815.c
--- 25/drivers/net/tc35815.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/tc35815.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/tokenring/3c359.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/tokenring/3c359.c
--- 25/drivers/net/tokenring/3c359.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/tokenring/3c359.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/tokenring/lanstreamer.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/tokenring/lanstreamer.c
--- 25/drivers/net/tokenring/lanstreamer.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/tokenring/lanstreamer.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/tokenring/olympic.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/tokenring/olympic.c
--- 25/drivers/net/tokenring/olympic.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/tokenring/olympic.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/tokenring/smctr.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/tokenring/smctr.c
--- 25/drivers/net/tokenring/smctr.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/tokenring/smctr.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/tokenring/tms380tr.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/tokenring/tms380tr.c
--- 25/drivers/net/tokenring/tms380tr.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/tokenring/tms380tr.c	Thu Oct  7 14:46:47 2004
@@ -96,9 +96,9 @@ static const char version[] = "tms380tr.
 #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 -puN drivers/net/tulip/de4x5.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/tulip/de4x5.c
--- 25/drivers/net/tulip/de4x5.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/tulip/de4x5.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/tulip/dmfe.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/tulip/dmfe.c
--- 25/drivers/net/tulip/dmfe.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/tulip/dmfe.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/tulip/winbond-840.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/tulip/winbond-840.c
--- 25/drivers/net/tulip/winbond-840.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/tulip/winbond-840.c	Thu Oct  7 14:46:47 2004
@@ -130,9 +130,9 @@ static int full_duplex[MAX_UNITS] = {-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 -puN drivers/net/tulip/xircom_cb.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/tulip/xircom_cb.c
--- 25/drivers/net/tulip/xircom_cb.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/tulip/xircom_cb.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/typhoon.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/typhoon.c
--- 25/drivers/net/typhoon.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/typhoon.c	Thu Oct  7 14:46:47 2004
@@ -115,8 +115,8 @@ static const int multicast_filter_limit 
 #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 -puN drivers/net/via-rhine.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/via-rhine.c
--- 25/drivers/net/via-rhine.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/via-rhine.c	Thu Oct  7 14:46:47 2004
@@ -193,8 +193,8 @@ static const int multicast_filter_limit 
 #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 -puN drivers/net/wan/dlci.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/wan/dlci.c
--- 25/drivers/net/wan/dlci.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/wan/dlci.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/wan/hd6457x.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/wan/hd6457x.c
--- 25/drivers/net/wan/hd6457x.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/wan/hd6457x.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/wan/lmc/lmc_main.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/wan/lmc/lmc_main.c
--- 25/drivers/net/wan/lmc/lmc_main.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/wan/lmc/lmc_main.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/wan/lmc/lmc_media.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/wan/lmc/lmc_media.c
--- 25/drivers/net/wan/lmc/lmc_media.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/wan/lmc/lmc_media.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/wan/lmc/lmc_proto.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/wan/lmc/lmc_proto.c
--- 25/drivers/net/wan/lmc/lmc_proto.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/wan/lmc/lmc_proto.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/wan/sdla.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/wan/sdla.c
--- 25/drivers/net/wan/sdla.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/wan/sdla.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/wan/x25_asy.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/wan/x25_asy.c
--- 25/drivers/net/wan/x25_asy.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/wan/x25_asy.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/wireless/airo.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/wireless/airo.c
--- 25/drivers/net/wireless/airo.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/wireless/airo.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/wireless/arlan.h~include-asm-bitopsh-include-linux-bitopsh drivers/net/wireless/arlan.h
--- 25/drivers/net/wireless/arlan.h~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/wireless/arlan.h	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/wireless/netwave_cs.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/wireless/netwave_cs.c
--- 25/drivers/net/wireless/netwave_cs.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/wireless/netwave_cs.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/wireless/strip.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/wireless/strip.c
--- 25/drivers/net/wireless/strip.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/wireless/strip.c	Thu Oct  7 14:46:47 2004
@@ -85,9 +85,9 @@ static const char StripVersion[] = "1.3A
 #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 -puN drivers/net/wireless/wavelan_cs.p.h~include-asm-bitopsh-include-linux-bitopsh drivers/net/wireless/wavelan_cs.p.h
--- 25/drivers/net/wireless/wavelan_cs.p.h~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/wireless/wavelan_cs.p.h	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/wireless/wavelan.p.h~include-asm-bitopsh-include-linux-bitopsh drivers/net/wireless/wavelan.p.h
--- 25/drivers/net/wireless/wavelan.p.h~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/wireless/wavelan.p.h	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/yellowfin.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/yellowfin.c
--- 25/drivers/net/yellowfin.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/yellowfin.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/net/znet.c~include-asm-bitopsh-include-linux-bitopsh drivers/net/znet.c
--- 25/drivers/net/znet.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/net/znet.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/pcmcia/i82365.c~include-asm-bitopsh-include-linux-bitopsh drivers/pcmcia/i82365.c
--- 25/drivers/pcmcia/i82365.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/pcmcia/i82365.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/pcmcia/tcic.c~include-asm-bitopsh-include-linux-bitopsh drivers/pcmcia/tcic.c
--- 25/drivers/pcmcia/tcic.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/pcmcia/tcic.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/s390/net/ctcmain.c~include-asm-bitopsh-include-linux-bitopsh drivers/s390/net/ctcmain.c
--- 25/drivers/s390/net/ctcmain.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/s390/net/ctcmain.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/s390/net/netiucv.c~include-asm-bitopsh-include-linux-bitopsh drivers/s390/net/netiucv.c
--- 25/drivers/s390/net/netiucv.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/s390/net/netiucv.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/s390/net/qeth.h~include-asm-bitopsh-include-linux-bitopsh drivers/s390/net/qeth.h
--- 25/drivers/s390/net/qeth.h~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/s390/net/qeth.h	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/sbus/char/aurora.c~include-asm-bitopsh-include-linux-bitopsh drivers/sbus/char/aurora.c
--- 25/drivers/sbus/char/aurora.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/sbus/char/aurora.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/scsi/arm/acornscsi.c~include-asm-bitopsh-include-linux-bitopsh drivers/scsi/arm/acornscsi.c
--- 25/drivers/scsi/arm/acornscsi.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/scsi/arm/acornscsi.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/scsi/atari_scsi.c~include-asm-bitopsh-include-linux-bitopsh drivers/scsi/atari_scsi.c
--- 25/drivers/scsi/atari_scsi.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/scsi/atari_scsi.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/scsi/NCR53c406a.c~include-asm-bitopsh-include-linux-bitopsh drivers/scsi/NCR53c406a.c
--- 25/drivers/scsi/NCR53c406a.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/scsi/NCR53c406a.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/scsi/ultrastor.c~include-asm-bitopsh-include-linux-bitopsh drivers/scsi/ultrastor.c
--- 25/drivers/scsi/ultrastor.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/scsi/ultrastor.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/serial/68328serial.c~include-asm-bitopsh-include-linux-bitopsh drivers/serial/68328serial.c
--- 25/drivers/serial/68328serial.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/serial/68328serial.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/serial/8250_pci.c~include-asm-bitopsh-include-linux-bitopsh drivers/serial/8250_pci.c
--- 25/drivers/serial/8250_pci.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/serial/8250_pci.c	Thu Oct  7 14:46:47 2004
@@ -25,8 +25,8 @@
 #include <linux/serial.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 -puN drivers/serial/8250_pnp.c~include-asm-bitopsh-include-linux-bitopsh drivers/serial/8250_pnp.c
--- 25/drivers/serial/8250_pnp.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/serial/8250_pnp.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/serial/icom.c~include-asm-bitopsh-include-linux-bitopsh drivers/serial/icom.c
--- 25/drivers/serial/icom.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/serial/icom.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/serial/mcfserial.c~include-asm-bitopsh-include-linux-bitopsh drivers/serial/mcfserial.c
--- 25/drivers/serial/mcfserial.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/serial/mcfserial.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/serial/pmac_zilog.c~include-asm-bitopsh-include-linux-bitopsh drivers/serial/pmac_zilog.c
--- 25/drivers/serial/pmac_zilog.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/serial/pmac_zilog.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/serial/sh-sci.c~include-asm-bitopsh-include-linux-bitopsh drivers/serial/sh-sci.c
--- 25/drivers/serial/sh-sci.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/serial/sh-sci.c	Thu Oct  7 14:46:47 2004
@@ -40,6 +40,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>
@@ -50,7 +51,6 @@
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/uaccess.h>
-#include <asm/bitops.h>
 
 #include <linux/generic_serial.h>
 
diff -puN drivers/tc/zs.c~include-asm-bitopsh-include-linux-bitopsh drivers/tc/zs.c
--- 25/drivers/tc/zs.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/tc/zs.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/usb/host/uhci-hcd.c~include-asm-bitopsh-include-linux-bitopsh drivers/usb/host/uhci-hcd.c
--- 25/drivers/usb/host/uhci-hcd.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/usb/host/uhci-hcd.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/usb/net/catc.c~include-asm-bitopsh-include-linux-bitopsh drivers/usb/net/catc.c
--- 25/drivers/usb/net/catc.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/usb/net/catc.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN drivers/zorro/zorro.c~include-asm-bitopsh-include-linux-bitopsh drivers/zorro/zorro.c
--- 25/drivers/zorro/zorro.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/drivers/zorro/zorro.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN fs/adfs/super.c~include-asm-bitopsh-include-linux-bitopsh fs/adfs/super.c
--- 25/fs/adfs/super.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/fs/adfs/super.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN fs/autofs4/inode.c~include-asm-bitopsh-include-linux-bitopsh fs/autofs4/inode.c
--- 25/fs/autofs4/inode.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/fs/autofs4/inode.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN fs/autofs/inode.c~include-asm-bitopsh-include-linux-bitopsh fs/autofs/inode.c
--- 25/fs/autofs/inode.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/fs/autofs/inode.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN fs/buffer.c~include-asm-bitopsh-include-linux-bitopsh fs/buffer.c
--- 25/fs/buffer.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/fs/buffer.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN fs/coda/sysctl.c~include-asm-bitopsh-include-linux-bitopsh fs/coda/sysctl.c
--- 25/fs/coda/sysctl.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/fs/coda/sysctl.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN fs/devfs/base.c~include-asm-bitopsh-include-linux-bitopsh fs/devfs/base.c
--- 25/fs/devfs/base.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/fs/devfs/base.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN fs/devfs/util.c~include-asm-bitopsh-include-linux-bitopsh fs/devfs/util.c
--- 25/fs/devfs/util.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/fs/devfs/util.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN fs/eventpoll.c~include-asm-bitopsh-include-linux-bitopsh fs/eventpoll.c
--- 25/fs/eventpoll.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/fs/eventpoll.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN fs/ext3/ialloc.c~include-asm-bitopsh-include-linux-bitopsh fs/ext3/ialloc.c
--- 25/fs/ext3/ialloc.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/fs/ext3/ialloc.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN fs/file.c~include-asm-bitopsh-include-linux-bitopsh fs/file.c
--- 25/fs/file.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/fs/file.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN fs/jfs/jfs_incore.h~include-asm-bitopsh-include-linux-bitopsh fs/jfs/jfs_incore.h
--- 25/fs/jfs/jfs_incore.h~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/fs/jfs/jfs_incore.h	Thu Oct  7 14:46:47 2004
@@ -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 -puN fs/minix/bitmap.c~include-asm-bitopsh-include-linux-bitopsh fs/minix/bitmap.c
--- 25/fs/minix/bitmap.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/fs/minix/bitmap.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN fs/partitions/devfs.c~include-asm-bitopsh-include-linux-bitopsh fs/partitions/devfs.c
--- 25/fs/partitions/devfs.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/fs/partitions/devfs.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN fs/proc/generic.c~include-asm-bitopsh-include-linux-bitopsh fs/proc/generic.c
--- 25/fs/proc/generic.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/fs/proc/generic.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN fs/proc/proc_tty.c~include-asm-bitopsh-include-linux-bitopsh fs/proc/proc_tty.c
--- 25/fs/proc/proc_tty.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/fs/proc/proc_tty.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN fs/proc/root.c~include-asm-bitopsh-include-linux-bitopsh fs/proc/root.c
--- 25/fs/proc/root.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/fs/proc/root.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN fs/qnx4/bitmap.c~include-asm-bitopsh-include-linux-bitopsh fs/qnx4/bitmap.c
--- 25/fs/qnx4/bitmap.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/fs/qnx4/bitmap.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN fs/udf/balloc.c~include-asm-bitopsh-include-linux-bitopsh fs/udf/balloc.c
--- 25/fs/udf/balloc.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/fs/udf/balloc.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN fs/ufs/balloc.c~include-asm-bitopsh-include-linux-bitopsh fs/ufs/balloc.c
--- 25/fs/ufs/balloc.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/fs/ufs/balloc.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN fs/ufs/cylinder.c~include-asm-bitopsh-include-linux-bitopsh fs/ufs/cylinder.c
--- 25/fs/ufs/cylinder.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/fs/ufs/cylinder.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN fs/ufs/ialloc.c~include-asm-bitopsh-include-linux-bitopsh fs/ufs/ialloc.c
--- 25/fs/ufs/ialloc.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/fs/ufs/ialloc.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN fs/ufs/super.c~include-asm-bitopsh-include-linux-bitopsh fs/ufs/super.c
--- 25/fs/ufs/super.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/fs/ufs/super.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN include/linux/idr.h~include-asm-bitopsh-include-linux-bitopsh include/linux/idr.h
--- 25/include/linux/idr.h~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/include/linux/idr.h	Thu Oct  7 14:46:47 2004
@@ -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 -puN include/linux/mtd/gen_probe.h~include-asm-bitopsh-include-linux-bitopsh include/linux/mtd/gen_probe.h
--- 25/include/linux/mtd/gen_probe.h~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/include/linux/mtd/gen_probe.h	Thu Oct  7 14:46:47 2004
@@ -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 -puN include/net/pkt_act.h~include-asm-bitopsh-include-linux-bitopsh include/net/pkt_act.h
--- 25/include/net/pkt_act.h~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/include/net/pkt_act.h	Thu Oct  7 14:46:47 2004
@@ -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 -puN kernel/rcupdate.c~include-asm-bitopsh-include-linux-bitopsh kernel/rcupdate.c
--- 25/kernel/rcupdate.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/kernel/rcupdate.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN lib/bitmap.c~include-asm-bitopsh-include-linux-bitopsh lib/bitmap.c
--- 25/lib/bitmap.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/lib/bitmap.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN net/core/dev.c~include-asm-bitopsh-include-linux-bitopsh net/core/dev.c
--- 25/net/core/dev.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/net/core/dev.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN net/core/dev_mcast.c~include-asm-bitopsh-include-linux-bitopsh net/core/dev_mcast.c
--- 25/net/core/dev_mcast.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/net/core/dev_mcast.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN net/core/link_watch.c~include-asm-bitopsh-include-linux-bitopsh net/core/link_watch.c
--- 25/net/core/link_watch.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/net/core/link_watch.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN net/core/pktgen.c~include-asm-bitopsh-include-linux-bitopsh net/core/pktgen.c
--- 25/net/core/pktgen.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/net/core/pktgen.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN net/econet/af_econet.c~include-asm-bitopsh-include-linux-bitopsh net/econet/af_econet.c
--- 25/net/econet/af_econet.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/net/econet/af_econet.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN net/ipv4/devinet.c~include-asm-bitopsh-include-linux-bitopsh net/ipv4/devinet.c
--- 25/net/ipv4/devinet.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/net/ipv4/devinet.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN net/ipv4/fib_frontend.c~include-asm-bitopsh-include-linux-bitopsh net/ipv4/fib_frontend.c
--- 25/net/ipv4/fib_frontend.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/net/ipv4/fib_frontend.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN net/ipv4/fib_hash.c~include-asm-bitopsh-include-linux-bitopsh net/ipv4/fib_hash.c
--- 25/net/ipv4/fib_hash.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/net/ipv4/fib_hash.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN net/ipv4/fib_rules.c~include-asm-bitopsh-include-linux-bitopsh net/ipv4/fib_rules.c
--- 25/net/ipv4/fib_rules.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/net/ipv4/fib_rules.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN net/ipv4/fib_semantics.c~include-asm-bitopsh-include-linux-bitopsh net/ipv4/fib_semantics.c
--- 25/net/ipv4/fib_semantics.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/net/ipv4/fib_semantics.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN net/ipv4/route.c~include-asm-bitopsh-include-linux-bitopsh net/ipv4/route.c
--- 25/net/ipv4/route.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/net/ipv4/route.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN net/irda/irlan/irlan_client.c~include-asm-bitopsh-include-linux-bitopsh net/irda/irlan/irlan_client.c
--- 25/net/irda/irlan/irlan_client.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/net/irda/irlan/irlan_client.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN net/irda/irlan/irlan_common.c~include-asm-bitopsh-include-linux-bitopsh net/irda/irlan/irlan_common.c
--- 25/net/irda/irlan/irlan_common.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/net/irda/irlan/irlan_common.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN net/irda/irlan/irlan_provider.c~include-asm-bitopsh-include-linux-bitopsh net/irda/irlan/irlan_provider.c
--- 25/net/irda/irlan/irlan_provider.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/net/irda/irlan/irlan_provider.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN net/netlink/netlink_dev.c~include-asm-bitopsh-include-linux-bitopsh net/netlink/netlink_dev.c
--- 25/net/netlink/netlink_dev.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/net/netlink/netlink_dev.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN net/sched/act_api.c~include-asm-bitopsh-include-linux-bitopsh net/sched/act_api.c
--- 25/net/sched/act_api.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/net/sched/act_api.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN net/sched/cls_api.c~include-asm-bitopsh-include-linux-bitopsh net/sched/cls_api.c
--- 25/net/sched/cls_api.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/net/sched/cls_api.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN net/sched/cls_fw.c~include-asm-bitopsh-include-linux-bitopsh net/sched/cls_fw.c
--- 25/net/sched/cls_fw.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/net/sched/cls_fw.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN net/sched/cls_route.c~include-asm-bitopsh-include-linux-bitopsh net/sched/cls_route.c
--- 25/net/sched/cls_route.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/net/sched/cls_route.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN net/sched/cls_rsvp6.c~include-asm-bitopsh-include-linux-bitopsh net/sched/cls_rsvp6.c
--- 25/net/sched/cls_rsvp6.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/net/sched/cls_rsvp6.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN net/sched/cls_rsvp.c~include-asm-bitopsh-include-linux-bitopsh net/sched/cls_rsvp.c
--- 25/net/sched/cls_rsvp.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/net/sched/cls_rsvp.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN net/sched/cls_u32.c~include-asm-bitopsh-include-linux-bitopsh net/sched/cls_u32.c
--- 25/net/sched/cls_u32.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/net/sched/cls_u32.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN net/sched/estimator.c~include-asm-bitopsh-include-linux-bitopsh net/sched/estimator.c
--- 25/net/sched/estimator.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/net/sched/estimator.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN net/sched/gact.c~include-asm-bitopsh-include-linux-bitopsh net/sched/gact.c
--- 25/net/sched/gact.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/net/sched/gact.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN net/sched/police.c~include-asm-bitopsh-include-linux-bitopsh net/sched/police.c
--- 25/net/sched/police.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/net/sched/police.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN net/sched/sch_api.c~include-asm-bitopsh-include-linux-bitopsh net/sched/sch_api.c
--- 25/net/sched/sch_api.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/net/sched/sch_api.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN net/sched/sch_cbq.c~include-asm-bitopsh-include-linux-bitopsh net/sched/sch_cbq.c
--- 25/net/sched/sch_cbq.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/net/sched/sch_cbq.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN net/sched/sch_fifo.c~include-asm-bitopsh-include-linux-bitopsh net/sched/sch_fifo.c
--- 25/net/sched/sch_fifo.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/net/sched/sch_fifo.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN net/sched/sch_generic.c~include-asm-bitopsh-include-linux-bitopsh net/sched/sch_generic.c
--- 25/net/sched/sch_generic.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/net/sched/sch_generic.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN net/sched/sch_gred.c~include-asm-bitopsh-include-linux-bitopsh net/sched/sch_gred.c
--- 25/net/sched/sch_gred.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/net/sched/sch_gred.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN net/sched/sch_htb.c~include-asm-bitopsh-include-linux-bitopsh net/sched/sch_htb.c
--- 25/net/sched/sch_htb.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/net/sched/sch_htb.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN net/sched/sch_netem.c~include-asm-bitopsh-include-linux-bitopsh net/sched/sch_netem.c
--- 25/net/sched/sch_netem.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/net/sched/sch_netem.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN net/sched/sch_prio.c~include-asm-bitopsh-include-linux-bitopsh net/sched/sch_prio.c
--- 25/net/sched/sch_prio.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/net/sched/sch_prio.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN net/sched/sch_red.c~include-asm-bitopsh-include-linux-bitopsh net/sched/sch_red.c
--- 25/net/sched/sch_red.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/net/sched/sch_red.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN net/sched/sch_sfq.c~include-asm-bitopsh-include-linux-bitopsh net/sched/sch_sfq.c
--- 25/net/sched/sch_sfq.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/net/sched/sch_sfq.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN net/sched/sch_tbf.c~include-asm-bitopsh-include-linux-bitopsh net/sched/sch_tbf.c
--- 25/net/sched/sch_tbf.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:46 2004
+++ 25-akpm/net/sched/sch_tbf.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN net/sched/sch_teql.c~include-asm-bitopsh-include-linux-bitopsh net/sched/sch_teql.c
--- 25/net/sched/sch_teql.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:47 2004
+++ 25-akpm/net/sched/sch_teql.c	Thu Oct  7 14:46:47 2004
@@ -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 -puN sound/pci/bt87x.c~include-asm-bitopsh-include-linux-bitopsh sound/pci/bt87x.c
--- 25/sound/pci/bt87x.c~include-asm-bitopsh-include-linux-bitopsh	Thu Oct  7 14:46:47 2004
+++ 25-akpm/sound/pci/bt87x.c	Thu Oct  7 14:46:47 2004
@@ -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>
_