diff options
114 files changed, 158 insertions, 158 deletions
diff --git a/Documentation/filesystems/ext3.txt b/Documentation/filesystems/ext3.txt index 84e8ca1f4418..12c01af809ac 100644 --- a/Documentation/filesystems/ext3.txt +++ b/Documentation/filesystems/ext3.txt @@ -78,7 +78,7 @@ design to add journaling capabilities on a block device. The ext3 filesystem code will inform the JBD of modifications it is performing (Call a transaction). the journal support the transactions start and stop, and in case of crash, the journal can replayed the transactions -to put the partition on a consistant state fastly. +to put the partition on a consistent state fastly. handles represent a single atomic update to a filesystem. JBD can handle external journal on a block device. diff --git a/Documentation/isdn/HiSax.cert b/Documentation/isdn/HiSax.cert index 2e3523ca7d22..f2a6fcb8efee 100644 --- a/Documentation/isdn/HiSax.cert +++ b/Documentation/isdn/HiSax.cert @@ -27,7 +27,7 @@ These tests included all layers 1-3 and as well all functional tests for the layer 1. Because all hardware based on these chips are complete ISDN solutions in one chip all cards and USB-TAs using these chips are to be regarded as approved for those tests. Some additional electrical tests -of the layer 1 which are independant of the driver and related to a +of the layer 1 which are independent of the driver and related to a special hardware used will be regarded as approved if at least one solution has been tested including those electrical tests. So if cards or tas have been completely approved for any other os, the approval diff --git a/Documentation/md.txt b/Documentation/md.txt index 0df89447bb0e..cecc9beba2fb 100644 --- a/Documentation/md.txt +++ b/Documentation/md.txt @@ -9,7 +9,7 @@ device with the following kernel command lines: for old raid arrays without persistent superblocks: md=<md device no.>,<raid level>,<chunk size factor>,<fault level>,dev0,dev1,...,devn -for raid arrays with persistant superblocks +for raid arrays with persistent superblocks md=<md device no.>,dev0,dev1,...,devn md device no. = the number of the md device ... @@ -21,7 +21,7 @@ md device no. = the number of the md device ... raid level = -1 linear mode 0 striped mode - other modes are only supported with persistant super blocks + other modes are only supported with persistent super blocks chunk size factor = (raid-0 and raid-1 only) Set the chunk size as 4k << n. diff --git a/Documentation/scsi/ChangeLog.sym53c8xx b/Documentation/scsi/ChangeLog.sym53c8xx index 423ceecfd9f3..8dc00328bf94 100644 --- a/Documentation/scsi/ChangeLog.sym53c8xx +++ b/Documentation/scsi/ChangeLog.sym53c8xx @@ -529,7 +529,7 @@ Sun Nov 1 14H00 1998 Gerard Roudier (groudier@club-internet.fr) * version pre-sym53c8xx-0.13 - Some rewrite of the device detection code. This code had been patched too much and needed to be face-lifted a bit. - Remove all platform dependant fix-ups that was not needed or + Remove all platform dependent fix-ups that was not needed or conflicted with some other driver code as work-arounds. Reread the NVRAM before the calling of ncr_attach(). This spares stack space and so allows to handle more boards. diff --git a/Documentation/scsi/ibmmca.txt b/Documentation/scsi/ibmmca.txt index 912d10209c1c..3957eb3034a4 100644 --- a/Documentation/scsi/ibmmca.txt +++ b/Documentation/scsi/ibmmca.txt @@ -906,7 +906,7 @@ to does not offer more space, invalid memory accesses destabilized the kernel. 3) version 4.0 is only valid for kernel 2.4.0 or later. This is necessary - to remove old kernel version dependant waste from the driver. 3.2d is + to remove old kernel version dependent waste from the driver. 3.2d is only distributed with older kernels but keeps compatibility with older kernel versions. 4.0 and higher versions cannot be used with older kernels anymore!! You must have at least kernel 2.4.0!! @@ -1382,7 +1382,7 @@ 9 Disclaimer ------------ - Beside the GNU General Public License and the dependant disclaimers and disclaimers + Beside the GNU General Public License and the dependent disclaimers and disclaimers concerning the Linux-kernel in special, this SCSI-driver comes without any warranty. Its functionality is tested as good as possible on certain machines and combinations of computer hardware, which does not exclude, diff --git a/Documentation/sparc/sbus_drivers.txt b/Documentation/sparc/sbus_drivers.txt index fc8ab4a8b10e..876195dc2aef 100644 --- a/Documentation/sparc/sbus_drivers.txt +++ b/Documentation/sparc/sbus_drivers.txt @@ -208,7 +208,7 @@ like the following: char *mem; /* Address in the CPU space */ u32 busa; /* Address in the SBus space */ - mem = (char *) sbus_alloc_consistant(sdev, MYMEMSIZE, &busa); + mem = (char *) sbus_alloc_consistent(sdev, MYMEMSIZE, &busa); Then mem is used when CPU accesses this memory and u32 is fed to the device so that it can do DVMA. This is typically @@ -216,7 +216,7 @@ done with an sbus_writel() into some device register. Do not forget to free the DVMA resources once you are done: - sbus_free_consistant(sdev, MYMEMSIZE, mem, busa); + sbus_free_consistent(sdev, MYMEMSIZE, mem, busa); Streaming DVMA is more interesting. First you allocate some memory suitable for it or pin down some user pages. Then it all works diff --git a/Documentation/tipar.txt b/Documentation/tipar.txt index 73e5548357cf..773b9a2483eb 100644 --- a/Documentation/tipar.txt +++ b/Documentation/tipar.txt @@ -12,7 +12,7 @@ INTRODUCTION: This is a driver for the very common home-made parallel link cable, a cable designed for connecting TI8x/9x graphing calculators (handhelds) to a computer or workstation (Alpha, Sparc). Given that driver is built on parport, the -parallel port abstraction layer, this driver is independant of the platform. +parallel port abstraction layer, this driver is independent of the platform. It can also be used with another device plugged on the same port (such as a ZIP drive). I have a 100MB ZIP and both of them work fine ! @@ -90,4 +90,4 @@ You can also mail JB at jb@jblache.org. He packaged these drivers for Debian. CREDITS: The code is based on tidev.c & parport.c. -The driver has been developed independantly of Texas Instruments. +The driver has been developed independently of Texas Instruments. diff --git a/Documentation/usb/silverlink.txt b/Documentation/usb/silverlink.txt index ae4b9ab3985b..d720415ebb34 100644 --- a/Documentation/usb/silverlink.txt +++ b/Documentation/usb/silverlink.txt @@ -73,4 +73,4 @@ this driver but he better knows the Mac OS-X driver. CREDITS: The code is based on dabusb.c, printer.c and scanner.c ! -The driver has been developed independantly of Texas Instruments. +The driver has been developed independently of Texas Instruments. diff --git a/arch/arm/mach-integrator/pci_v3.c b/arch/arm/mach-integrator/pci_v3.c index f2f73e15a11b..46dd55038145 100644 --- a/arch/arm/mach-integrator/pci_v3.c +++ b/arch/arm/mach-integrator/pci_v3.c @@ -120,7 +120,7 @@ * function = which function * offset = configuration space register we are interested in * - * description: this routine will generate a platform dependant config + * description: this routine will generate a platform dependent config * address. * * calls: none diff --git a/arch/arm/mach-sa1100/stork.c b/arch/arm/mach-sa1100/stork.c index 0c34c9d61bb8..9ac3a0a10c7d 100644 --- a/arch/arm/mach-sa1100/stork.c +++ b/arch/arm/mach-sa1100/stork.c @@ -181,7 +181,7 @@ static void storkClockTS(void) { storkSetLatchB(STORK_TOUCH_SCREEN_DCLK); udelay(10); /* hmm wait 200ns (min) - ok this ought to be udelay(1) but that doesn't get */ - /* consistant values so I'm using 10 (urgh) */ + /* consistent values so I'm using 10 (urgh) */ storkClearLatchB(STORK_TOUCH_SCREEN_DCLK); udelay(10); } diff --git a/arch/arm/mm/proc-arm920.S b/arch/arm/mm/proc-arm920.S index 09a2b12fad9b..cbeaaf9a0853 100644 --- a/arch/arm/mm/proc-arm920.S +++ b/arch/arm/mm/proc-arm920.S @@ -297,7 +297,7 @@ ENTRY(cpu_arm920_dcache_clean_entry) * * This is a little misleading, it is not intended to clean out * the i-cache but to make sure that any data written to the - * range is made consistant. This means that when we execute code + * range is made consistent. This means that when we execute code * in that region, everything works as we expect. * * This generally means writing back data in the Dcache and diff --git a/arch/arm/mm/proc-arm922.S b/arch/arm/mm/proc-arm922.S index 7bfbc8965019..f115e476bc7b 100644 --- a/arch/arm/mm/proc-arm922.S +++ b/arch/arm/mm/proc-arm922.S @@ -298,7 +298,7 @@ ENTRY(cpu_arm922_dcache_clean_entry) * * This is a little misleading, it is not intended to clean out * the i-cache but to make sure that any data written to the - * range is made consistant. This means that when we execute code + * range is made consistent. This means that when we execute code * in that region, everything works as we expect. * * This generally means writing back data in the Dcache and diff --git a/arch/arm/mm/proc-arm926.S b/arch/arm/mm/proc-arm926.S index 24b5d4f70217..a2cdcdd3d9f3 100644 --- a/arch/arm/mm/proc-arm926.S +++ b/arch/arm/mm/proc-arm926.S @@ -147,7 +147,7 @@ cpu_arm926_cache_clean_invalidate_all_r2: * * This is a little misleading, it is not intended to clean out * the i-cache but to make sure that any data written to the - * range is made consistant. This means that when we execute code + * range is made consistent. This means that when we execute code * in that region, everything works as we expect. * * This generally means writing back data in the Dcache and diff --git a/arch/cris/drivers/serial.c b/arch/cris/drivers/serial.c index 412f7519c488..13bcee964f09 100644 --- a/arch/cris/drivers/serial.c +++ b/arch/cris/drivers/serial.c @@ -318,7 +318,7 @@ static char *serial_version = "$Revision: 1.3 $"; #include <asm/svinto.h> -/* non-arch dependant serial structures are in linux/serial.h */ +/* non-arch dependent serial structures are in linux/serial.h */ #include <linux/serial.h> /* while we keep our own stuff (struct e100_serial) in a local .h file */ #include "serial.h" diff --git a/arch/cris/kernel/ptrace.c b/arch/cris/kernel/ptrace.c index b4e1f9282694..c8a066c4ee4c 100644 --- a/arch/cris/kernel/ptrace.c +++ b/arch/cris/kernel/ptrace.c @@ -18,7 +18,7 @@ * PTRACE_DETACH works more simple in 2.4.10 * * Revision 1.6 2001/07/25 16:08:47 bjornw - * PTRACE_ATTACH bulk moved into arch-independant code in 2.4.7 + * PTRACE_ATTACH bulk moved into arch-independent code in 2.4.7 * * Revision 1.5 2001/03/26 14:24:28 orjanf * * Changed loop condition. diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c index 15d820d88c64..cb5a89f68763 100644 --- a/arch/ia64/kernel/smpboot.c +++ b/arch/ia64/kernel/smpboot.c @@ -551,7 +551,7 @@ __cpu_up (unsigned int cpu) } /* - * Assume that CPU's have been discovered by some platform-dependant interface. For + * Assume that CPU's have been discovered by some platform-dependent interface. For * SoftSDV/Lion, that would be ACPI. * * Setup of the IPI irq handler is done in irq.c:init_IRQ_SMP(). diff --git a/arch/ia64/sn/io/sn1/pcibr.c b/arch/ia64/sn/io/sn1/pcibr.c index ac30ed1badd8..6029f26613fe 100644 --- a/arch/ia64/sn/io/sn1/pcibr.c +++ b/arch/ia64/sn/io/sn1/pcibr.c @@ -4811,7 +4811,7 @@ pcibr_dmamap_alloc(devfs_handle_t pconn_vhdl, /* Device is capable of A64 operations, * and the attributes of the DMA are - * consistant with any previous DMA + * consistent with any previous DMA * mappings using shared resources. */ @@ -4853,7 +4853,7 @@ pcibr_dmamap_alloc(devfs_handle_t pconn_vhdl, if (!pcibr_try_set_device(pcibr_soft, slot, flags, BRIDGE_DEV_D32_BITS)) { /* User desires DIRECT A32 operations, * and the attributes of the DMA are - * consistant with any previous DMA + * consistent with any previous DMA * mappings using shared resources. * Mapping calls may fail if target * is outside the direct32 range. diff --git a/arch/ia64/sn/io/sn2/pcibr/pcibr_dvr.c b/arch/ia64/sn/io/sn2/pcibr/pcibr_dvr.c index 867178f42fab..54939d8508c9 100644 --- a/arch/ia64/sn/io/sn2/pcibr/pcibr_dvr.c +++ b/arch/ia64/sn/io/sn2/pcibr/pcibr_dvr.c @@ -3216,7 +3216,7 @@ pcibr_dmamap_alloc(devfs_handle_t pconn_vhdl, /* Device is capable of A64 operations, * and the attributes of the DMA are - * consistant with any previous DMA + * consistent with any previous DMA * mappings using shared resources. */ @@ -3266,7 +3266,7 @@ pcibr_dmamap_alloc(devfs_handle_t pconn_vhdl, if (!pcibr_try_set_device(pcibr_soft, slot, flags, BRIDGE_DEV_D32_BITS)) { /* User desires DIRECT A32 operations, * and the attributes of the DMA are - * consistant with any previous DMA + * consistent with any previous DMA * mappings using shared resources. * Mapping calls may fail if target * is outside the direct32 range. diff --git a/arch/m68k/mac/macints.c b/arch/m68k/mac/macints.c index 4f8ea17f57ac..b0a647a964fc 100644 --- a/arch/m68k/mac/macints.c +++ b/arch/m68k/mac/macints.c @@ -749,7 +749,7 @@ void mac_scc_dispatch(int irq, void *dev_id, struct pt_regs *regs) /* */ /* Note that we're ignoring scc_mask for now. */ /* If we actually mask the ints then we tend to */ - /* get hammered by very persistant SCC irqs, */ + /* get hammered by very persistent SCC irqs, */ /* and since they're autovector interrupts they */ /* pretty much kill the system. */ diff --git a/arch/m68k/mac/via.c b/arch/m68k/mac/via.c index 53b448deb37a..5b43e574046d 100644 --- a/arch/m68k/mac/via.c +++ b/arch/m68k/mac/via.c @@ -48,7 +48,7 @@ __u8 rbv_clear; * just hit the combined register (ie, vIER|rIER) but that seems to * break on AV Macs...probably because they actually decode more than * eight address bits. Why can't Apple engineers at least be - * _consistantly_ lazy? - 1999-05-21 (jmt) + * _consistently_ lazy? - 1999-05-21 (jmt) */ static int gIER,gIFR,gBufA,gBufB; diff --git a/arch/m68knommu/platform/68360/uCquicc/crt0_ram.S b/arch/m68knommu/platform/68360/uCquicc/crt0_ram.S index c8d9142cdd24..56027aac42f8 100644 --- a/arch/m68knommu/platform/68360/uCquicc/crt0_ram.S +++ b/arch/m68knommu/platform/68360/uCquicc/crt0_ram.S @@ -358,7 +358,7 @@ _ramend: .long 0 /* (Unassigned, Reserved) - 62. */ .long 0 /* (Unassigned, Reserved) - 63. */ /* The assignment of these vectors to the CPM is */ - /* dependant on the configuration of the CPM vba */ + /* dependent on the configuration of the CPM vba */ /* fields. */ .long 0 /* (User-Defined Vectors 1) CPM Error - 64. */ .long 0 /* (User-Defined Vectors 2) CPM Parallel IO PC11- 65. */ diff --git a/arch/m68knommu/platform/68360/uCquicc/crt0_rom.S b/arch/m68knommu/platform/68360/uCquicc/crt0_rom.S index 6c0df839eb7a..ed9187c740ac 100644 --- a/arch/m68knommu/platform/68360/uCquicc/crt0_rom.S +++ b/arch/m68knommu/platform/68360/uCquicc/crt0_rom.S @@ -367,7 +367,7 @@ _ramend: .long 0 /* (Unassigned, Reserved) - 62. */ .long 0 /* (Unassigned, Reserved) - 63. */ /* The assignment of these vectors to the CPM is */ - /* dependant on the configuration of the CPM vba */ + /* dependent on the configuration of the CPM vba */ /* fields. */ .long 0 /* (User-Defined Vectors 1) CPM Error - 64. */ .long 0 /* (User-Defined Vectors 2) CPM Parallel IO PC11- 65. */ diff --git a/arch/parisc/kernel/entry.S b/arch/parisc/kernel/entry.S index 2b858b1b67a0..84064c3a02bd 100644 --- a/arch/parisc/kernel/entry.S +++ b/arch/parisc/kernel/entry.S @@ -689,7 +689,7 @@ syscall_exit_rfi: * (we don't store them in the sigcontext), so set them * to "proper" values now (otherwise we'll wind up restoring * whatever was last stored in the task structure, which might - * be inconsistant if an interrupt occured while on the gateway + * be inconsistent if an interrupt occured while on the gateway * page) Note that we may be "trashing" values the user put in * them, but we don't support the the user changing them. */ diff --git a/arch/ppc/boot/simple/Makefile b/arch/ppc/boot/simple/Makefile index 82f57d14b810..40cd523f7587 100644 --- a/arch/ppc/boot/simple/Makefile +++ b/arch/ppc/boot/simple/Makefile @@ -19,7 +19,7 @@ # ENTRYPOINT which the image should be loaded at. The optimal setting # for ENTRYPOINT is the link address. # (4) It is advisable to pass in the memory size using BI_MEMSIZE and -# get_mem_size(), which is memory controller dependant. Add in the correct +# get_mem_size(), which is memory controller dependent. Add in the correct # XXX_memory.o file for this to work, as well as editing the $(MISC) file. boot: zImage diff --git a/arch/ppc/boot/simple/misc.c b/arch/ppc/boot/simple/misc.c index e204557f2494..6b2909ed4eae 100644 --- a/arch/ppc/boot/simple/misc.c +++ b/arch/ppc/boot/simple/misc.c @@ -82,7 +82,7 @@ decompress_kernel(unsigned long load_addr, int num_words, unsigned long cksum) #if defined(CONFIG_LOPEC) || defined(CONFIG_PAL4) /* - * Call get_mem_size(), which is memory controller dependant, + * Call get_mem_size(), which is memory controller dependent, * and we must have the correct file linked in here. */ TotalMemory = get_mem_size(); diff --git a/arch/ppc/kernel/pci.c b/arch/ppc/kernel/pci.c index 90df3328b3e8..ee68f236114b 100644 --- a/arch/ppc/kernel/pci.c +++ b/arch/ppc/kernel/pci.c @@ -1069,7 +1069,7 @@ pcibios_init(void) if (ppc_md.pci_swizzle && ppc_md.pci_map_irq) pci_fixup_irqs(ppc_md.pci_swizzle, ppc_md.pci_map_irq); - /* Call machine dependant fixup */ + /* Call machine dependent fixup */ if (ppc_md.pcibios_fixup) ppc_md.pcibios_fixup(); diff --git a/arch/ppc64/kernel/pci.c b/arch/ppc64/kernel/pci.c index 049a5e58ffd7..c459ee120097 100644 --- a/arch/ppc64/kernel/pci.c +++ b/arch/ppc64/kernel/pci.c @@ -413,7 +413,7 @@ pcibios_init(void) next_busno = hose->last_busno+1; } - /* Call machine dependant fixup */ + /* Call machine dependent fixup */ if (ppc_md.pcibios_fixup) { ppc_md.pcibios_fixup(); } diff --git a/arch/sh/kernel/io.c b/arch/sh/kernel/io.c index 1b0f0918dfd6..1f49c739d1bc 100644 --- a/arch/sh/kernel/io.c +++ b/arch/sh/kernel/io.c @@ -4,7 +4,7 @@ * Copyright (C) 2000 Stuart Menefy * * Provide real functions which expand to whatever the header file defined. - * Also definitions of machine independant IO functions. + * Also definitions of machine independent IO functions. */ #include <asm/io.h> diff --git a/arch/sparc/kernel/entry.S b/arch/sparc/kernel/entry.S index d4c1e922b59f..4434547f406d 100644 --- a/arch/sparc/kernel/entry.S +++ b/arch/sparc/kernel/entry.S @@ -1889,7 +1889,7 @@ C_LABEL(kill_user_windows): wr %o4, 0x0, %psr ! the uwinmask state WRITE_PAUSE ! burn them cycles 1: - ld [%g6 + TI_UWINMASK], %o0 ! get consistant state + ld [%g6 + TI_UWINMASK], %o0 ! get consistent state orcc %g0, %o0, %g0 ! did an interrupt come in? be 4f ! yep, we are done rd %wim, %o3 ! get current wim diff --git a/arch/sparc/kernel/sys_sparc.c b/arch/sparc/kernel/sys_sparc.c index d060b430c08c..fbf31d498e8e 100644 --- a/arch/sparc/kernel/sys_sparc.c +++ b/arch/sparc/kernel/sys_sparc.c @@ -409,7 +409,7 @@ sparc_sigaction (int sig, const struct old_sigaction *act, ret = do_sigaction(sig, act ? &new_ka : NULL, oact ? &old_ka : NULL); if (!ret && oact) { - /* In the clone() case we could copy half consistant + /* In the clone() case we could copy half consistent * state to the user, however this could sleep and * deadlock us if we held the signal lock on SMP. So for * now I take the easy way out and do no locking. diff --git a/arch/sparc/kernel/sys_sunos.c b/arch/sparc/kernel/sys_sunos.c index 1babc9d4d326..a81ca4978702 100644 --- a/arch/sparc/kernel/sys_sunos.c +++ b/arch/sparc/kernel/sys_sunos.c @@ -1168,7 +1168,7 @@ sunos_sigaction(int sig, const struct old_sigaction *act, ret = do_sigaction(sig, act ? &new_ka : NULL, oact ? &old_ka : NULL); if (!ret && oact) { - /* In the clone() case we could copy half consistant + /* In the clone() case we could copy half consistent * state to the user, however this could sleep and * deadlock us if we held the signal lock on SMP. So for * now I take the easy way out and do no locking. diff --git a/arch/sparc/math-emu/math.c b/arch/sparc/math-emu/math.c index 050431cfcd87..cd15e4f41ef2 100644 --- a/arch/sparc/math-emu/math.c +++ b/arch/sparc/math-emu/math.c @@ -203,7 +203,7 @@ int do_mathemu(struct pt_regs *regs, struct task_struct *fpt) } /* All routines returning an exception to raise should detect - * such exceptions _before_ rounding to be consistant with + * such exceptions _before_ rounding to be consistent with * the behavior of the hardware in the implemented cases * (and thus with the recommendations in the V9 architecture * manual). diff --git a/arch/sparc/mm/sun4c.c b/arch/sparc/mm/sun4c.c index 74c23da4a7b0..5b165f0d3b1b 100644 --- a/arch/sparc/mm/sun4c.c +++ b/arch/sparc/mm/sun4c.c @@ -1042,7 +1042,7 @@ static struct thread_info *sun4c_alloc_thread_info(void) get_locked_segment(addr); /* We are changing the virtual color of the page(s) - * so we must flush the cache to guarentee consistancy. + * so we must flush the cache to guarentee consistency. */ sun4c_flush_page(pages); #ifndef CONFIG_SUN4 diff --git a/arch/sparc64/kernel/sbus.c b/arch/sparc64/kernel/sbus.c index 27ffa86806f9..9a5f8a99cfdc 100644 --- a/arch/sparc64/kernel/sbus.c +++ b/arch/sparc64/kernel/sbus.c @@ -767,7 +767,7 @@ unsigned int sbus_build_irq(void *buscookie, unsigned int ino) } imap += reg_base; - /* SYSIO inconsistancy. For external SLOTS, we have to select + /* SYSIO inconsistency. For external SLOTS, we have to select * the right ICLR register based upon the lower SBUS irq level * bits. */ diff --git a/arch/sparc64/kernel/winfixup.S b/arch/sparc64/kernel/winfixup.S index a633e009aae9..707e85e8f59b 100644 --- a/arch/sparc64/kernel/winfixup.S +++ b/arch/sparc64/kernel/winfixup.S @@ -60,7 +60,7 @@ fill_fixup: sll %g2, 3, %g2 ! NORMAL-->OTHER wrpr %g0, 0x0, %canrestore ! Standard etrap stuff. - wrpr %g2, 0x0, %wstate ! This must be consistant. + wrpr %g2, 0x0, %wstate ! This must be consistent. wrpr %g0, 0x0, %otherwin ! We know this. mov PRIMARY_CONTEXT, %g1 ! Change contexts... stxa %g0, [%g1] ASI_DMMU ! Back into the nucleus. @@ -181,7 +181,7 @@ fill_fixup_mna: sll %g2, 3, %g2 ! NORMAL-->OTHER wrpr %g0, 0x0, %canrestore ! Standard etrap stuff. - wrpr %g2, 0x0, %wstate ! This must be consistant. + wrpr %g2, 0x0, %wstate ! This must be consistent. wrpr %g0, 0x0, %otherwin ! We know this. mov PRIMARY_CONTEXT, %g1 ! Change contexts... stxa %g0, [%g1] ASI_DMMU ! Back into the nucleus. @@ -287,7 +287,7 @@ fill_fixup_dax: sll %g2, 3, %g2 ! NORMAL-->OTHER wrpr %g0, 0x0, %canrestore ! Standard etrap stuff. - wrpr %g2, 0x0, %wstate ! This must be consistant. + wrpr %g2, 0x0, %wstate ! This must be consistent. wrpr %g0, 0x0, %otherwin ! We know this. mov PRIMARY_CONTEXT, %g1 ! Change contexts... stxa %g0, [%g1] ASI_DMMU ! Back into the nucleus. diff --git a/arch/sparc64/math-emu/math.c b/arch/sparc64/math-emu/math.c index f45419845cde..48dfa37ddd72 100644 --- a/arch/sparc64/math-emu/math.c +++ b/arch/sparc64/math-emu/math.c @@ -88,7 +88,7 @@ #define FSR_CEXC_MASK (0x1fUL << FSR_CEXC_SHIFT) /* All routines returning an exception to raise should detect - * such exceptions _before_ rounding to be consistant with + * such exceptions _before_ rounding to be consistent with * the behavior of the hardware in the implemented cases * (and thus with the recommendations in the V9 architecture * manual). diff --git a/arch/v850/kernel/rte_mb_a_pci.c b/arch/v850/kernel/rte_mb_a_pci.c index c56b0d28bb98..6fc07ccd955e 100644 --- a/arch/v850/kernel/rte_mb_a_pci.c +++ b/arch/v850/kernel/rte_mb_a_pci.c @@ -689,7 +689,7 @@ void pci_unmap_single (struct pci_dev *pdev, dma_addr_t dma_addr, size_t size, free_dma_mapping (mapping); } -/* Make physical memory consistant for a single streaming mode DMA +/* Make physical memory consistent for a single streaming mode DMA translation after a transfer. If you perform a pci_map_single() but wish to interrogate the @@ -731,7 +731,7 @@ pci_unmap_sg (struct pci_dev *pdev, struct scatterlist *sg, int sg_len,int dir) BUG (); } -/* Make physical memory consistant for a set of streaming mode DMA +/* Make physical memory consistent for a set of streaming mode DMA translations after a transfer. The same as pci_dma_sync_single but for a scatter-gather list, same rules and usage. */ diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c index 8ca6798f0796..e6788148675b 100644 --- a/drivers/atm/lanai.c +++ b/drivers/atm/lanai.c @@ -632,7 +632,7 @@ static inline void reset_board(const struct lanai_dev *lanai) * anytime it wants to consult its table of vccs - for instance * when handling an incoming PDU. This also explains why we would * probably want the write_lock while in _change_qos - to prevent - * handling of PDUs while possibly in an inconsistant state. + * handling of PDUs while possibly in an inconsistent state. * Also, _send would grab the lock for reading. * * One problem with this is that _open and _close could no longer diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index c71a04f5d457..0f9f7a9de7ba 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -24,7 +24,7 @@ * 01-3-11 Make nbd work with new Linux block layer code. It now supports * plugging like all the other block devices. Also added in MSG_MORE to * reduce number of partial TCP segments sent. <steve@chygwyn.com> - * 01-12-6 Fix deadlock condition by making queue locks independant of + * 01-12-6 Fix deadlock condition by making queue locks independent of * the transmit lock. <steve@chygwyn.com> * 02-10-11 Allow hung xmit to be aborted via SIGKILL & various fixes. * <Paul.Clements@SteelEye.com> <James.Bottomley@SteelEye.com> diff --git a/drivers/char/ip2/i2ellis.c b/drivers/char/ip2/i2ellis.c index 443f414eea68..f834d05ccc97 100644 --- a/drivers/char/ip2/i2ellis.c +++ b/drivers/char/ip2/i2ellis.c @@ -773,7 +773,7 @@ iiWriteBuf16(i2eBordStrPtr pB, unsigned char *address, int count) // // Writes 'count' bytes from 'address' to the data fifo specified by the board // structure pointer pB. Should count happen to be odd, an extra pad byte is -// sent (identity unknown...). This is to be consistant with the 16-bit version. +// sent (identity unknown...). This is to be consistent with the 16-bit version. // Uses 8-bit (byte) operations. Is called indirectly through pB->i2eWriteBuf. // //****************************************************************************** diff --git a/drivers/char/ip2/i2os.h b/drivers/char/ip2/i2os.h index 8466d774700e..c83e901ea63f 100644 --- a/drivers/char/ip2/i2os.h +++ b/drivers/char/ip2/i2os.h @@ -8,7 +8,7 @@ * PACKAGE: Linux tty Device Driver for IntelliPort II family of multiport * serial I/O controllers. * -* DESCRIPTION: Defines, definitions and includes which are heavily dependant +* DESCRIPTION: Defines, definitions and includes which are heavily dependent * on O/S, host, compiler, etc. This file is tailored for: * Linux v2.0.0 and later * Gnu gcc c2.7.2 diff --git a/drivers/char/ip2main.c b/drivers/char/ip2main.c index 244399a6ae04..7ca1e640b7cc 100644 --- a/drivers/char/ip2main.c +++ b/drivers/char/ip2main.c @@ -21,7 +21,7 @@ // // 1.2.14 /\/\|=mhw=|\/\/ // Added bounds checking to ip2_ipl_ioctl to avoid potential terroristic acts. -// Changed the definition of ip2trace to be more consistant with kernel style +// Changed the definition of ip2trace to be more consistent with kernel style // Thanks to Andreas Dilger <adilger@turbolabs.com> for these updates // // 1.2.13 /\/\|=mhw=|\/\/ diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c index d1d8717f31bb..3565715eb561 100644 --- a/drivers/char/nvram.c +++ b/drivers/char/nvram.c @@ -11,7 +11,7 @@ * "NVRAM" (NV stands for non-volatile). * * The data are supplied as a (seekable) character device, /dev/nvram. The - * size of this file is dependant on the controller. The usual size is 114, + * size of this file is dependent on the controller. The usual size is 114, * the number of freely available bytes in the memory (i.e., not used by the * RTC itself). * diff --git a/drivers/char/rio/riotty.c b/drivers/char/rio/riotty.c index 15868bfbb285..3e0de643fe2e 100644 --- a/drivers/char/rio/riotty.c +++ b/drivers/char/rio/riotty.c @@ -1287,7 +1287,7 @@ register caddr_t arg; } /* - ttyseth -- set hardware dependant tty settings + ttyseth -- set hardware dependent tty settings */ void ttyseth(PortP, s, sg) @@ -1342,7 +1342,7 @@ struct old_sgttyb *sg; } /* - ttyseth_pv -- set hardware dependant tty settings using either the + ttyseth_pv -- set hardware dependent tty settings using either the POSIX termios structure or the System V termio structure. sysv = 0 => (POSIX): struct termios *sg sysv != 0 => (System V): struct termio *sg diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c index 1e5f4c6ec5a1..cf6e7b75dbac 100644 --- a/drivers/char/rtc.c +++ b/drivers/char/rtc.c @@ -486,7 +486,7 @@ static int rtc_do_ioctl(unsigned int cmd, unsigned long arg, int kernel) yrs = 73; } #endif - /* These limits and adjustments are independant of + /* These limits and adjustments are independent of * whether the chip is in binary mode or not. */ if (yrs > 169) { diff --git a/drivers/hotplug/cpci_hotplug_pci.c b/drivers/hotplug/cpci_hotplug_pci.c index da4d0d77b13b..822a7b9353e6 100644 --- a/drivers/hotplug/cpci_hotplug_pci.c +++ b/drivers/hotplug/cpci_hotplug_pci.c @@ -341,7 +341,7 @@ static int cpci_configure_dev(struct pci_bus *bus, struct pci_dev *dev) /* * Need to explicitly set irq field to 0 so that it'll get assigned - * by the pcibios platform dependant code called by pci_enable_device. + * by the pcibios platform dependent code called by pci_enable_device. */ dev->irq = 0; diff --git a/drivers/hotplug/cpqphp_core.c b/drivers/hotplug/cpqphp_core.c index 5e641fd1c6e3..15b4f37424e6 100644 --- a/drivers/hotplug/cpqphp_core.c +++ b/drivers/hotplug/cpqphp_core.c @@ -42,7 +42,7 @@ #include "cpqphp.h" #include "cpqphp_nvram.h" -#include "../../arch/i386/pci/pci.h" /* horrible hack showing how processor dependant we are... */ +#include "../../arch/i386/pci/pci.h" /* horrible hack showing how processor dependent we are... */ /* Global variables */ diff --git a/drivers/hotplug/cpqphp_pci.c b/drivers/hotplug/cpqphp_pci.c index 1d3bb90efdf2..e8e5328b7666 100644 --- a/drivers/hotplug/cpqphp_pci.c +++ b/drivers/hotplug/cpqphp_pci.c @@ -36,7 +36,7 @@ #include <linux/pci.h> #include "cpqphp.h" #include "cpqphp_nvram.h" -#include "../../arch/i386/pci/pci.h" /* horrible hack showing how processor dependant we are... */ +#include "../../arch/i386/pci/pci.h" /* horrible hack showing how processor dependent we are... */ u8 cpqhp_nic_irq; diff --git a/drivers/ide/pci/sis5513.c b/drivers/ide/pci/sis5513.c index c91a7f93c6d5..9812cb5bef09 100644 --- a/drivers/ide/pci/sis5513.c +++ b/drivers/ide/pci/sis5513.c @@ -22,7 +22,7 @@ /* * TODO: - * - Get ridden of SisHostChipInfo[] completness dependancy. + * - Get ridden of SisHostChipInfo[] completness dependency. * - Study drivers/ide/ide-timing.h. * - Are there pre-ATA_16 SiS5513 chips ? -> tune init code for them * or remove ATA_00 define @@ -64,7 +64,7 @@ /* Miscellaneaous flags */ #define SIS5513_LATENCY 0x01 -/* registers layout and init values are chipset family dependant */ +/* registers layout and init values are chipset family dependent */ /* 1/ define families */ #define ATA_00 0x00 #define ATA_16 0x01 diff --git a/drivers/isdn/eicon/eicon.h b/drivers/isdn/eicon/eicon.h index f2c6a043a056..4070b06f2380 100644 --- a/drivers/isdn/eicon/eicon.h +++ b/drivers/isdn/eicon/eicon.h @@ -305,7 +305,7 @@ typedef struct { * Per card driver data */ typedef struct eicon_card { - eicon_hwif hwif; /* Hardware dependant interface */ + eicon_hwif hwif; /* Hardware dependent interface */ DESCRIPTOR *d; /* IDI Descriptor */ u_char ptype; /* Protocol type (1TR6 or Euro) */ u_char bus; /* Bustype (ISA, MCA, PCI) */ diff --git a/drivers/isdn/hisax/isdnl2.c b/drivers/isdn/hisax/isdnl2.c index be30c6ea972f..87142482cf05 100644 --- a/drivers/isdn/hisax/isdnl2.c +++ b/drivers/isdn/hisax/isdnl2.c @@ -1445,7 +1445,7 @@ l2_tei_remove(struct FsmInst *fi, int event, void *arg) } static void -l2_st14_persistant_da(struct FsmInst *fi, int event, void *arg) +l2_st14_persistent_da(struct FsmInst *fi, int event, void *arg) { struct PStack *st = fi->userdata; @@ -1456,7 +1456,7 @@ l2_st14_persistant_da(struct FsmInst *fi, int event, void *arg) } static void -l2_st5_persistant_da(struct FsmInst *fi, int event, void *arg) +l2_st5_persistent_da(struct FsmInst *fi, int event, void *arg) { struct PStack *st = fi->userdata; @@ -1469,7 +1469,7 @@ l2_st5_persistant_da(struct FsmInst *fi, int event, void *arg) } static void -l2_st6_persistant_da(struct FsmInst *fi, int event, void *arg) +l2_st6_persistent_da(struct FsmInst *fi, int event, void *arg) { struct PStack *st = fi->userdata; @@ -1480,7 +1480,7 @@ l2_st6_persistant_da(struct FsmInst *fi, int event, void *arg) } static void -l2_persistant_da(struct FsmInst *fi, int event, void *arg) +l2_persistent_da(struct FsmInst *fi, int event, void *arg) { struct PStack *st = fi->userdata; @@ -1615,14 +1615,14 @@ static struct FsmNode L2FnList[] __initdata = {ST_L2_6, EV_L2_FRAME_ERROR, l2_frame_error}, {ST_L2_7, EV_L2_FRAME_ERROR, l2_frame_error_reest}, {ST_L2_8, EV_L2_FRAME_ERROR, l2_frame_error_reest}, - {ST_L2_1, EV_L1_DEACTIVATE, l2_st14_persistant_da}, + {ST_L2_1, EV_L1_DEACTIVATE, l2_st14_persistent_da}, {ST_L2_2, EV_L1_DEACTIVATE, l2_st24_tei_remove}, {ST_L2_3, EV_L1_DEACTIVATE, l2_st3_tei_remove}, - {ST_L2_4, EV_L1_DEACTIVATE, l2_st14_persistant_da}, - {ST_L2_5, EV_L1_DEACTIVATE, l2_st5_persistant_da}, - {ST_L2_6, EV_L1_DEACTIVATE, l2_st6_persistant_da}, - {ST_L2_7, EV_L1_DEACTIVATE, l2_persistant_da}, - {ST_L2_8, EV_L1_DEACTIVATE, l2_persistant_da}, + {ST_L2_4, EV_L1_DEACTIVATE, l2_st14_persistent_da}, + {ST_L2_5, EV_L1_DEACTIVATE, l2_st5_persistent_da}, + {ST_L2_6, EV_L1_DEACTIVATE, l2_st6_persistent_da}, + {ST_L2_7, EV_L1_DEACTIVATE, l2_persistent_da}, + {ST_L2_8, EV_L1_DEACTIVATE, l2_persistent_da}, }; #define L2_FN_COUNT (sizeof(L2FnList)/sizeof(struct FsmNode)) diff --git a/drivers/isdn/hisax/l3dss1.c b/drivers/isdn/hisax/l3dss1.c index 0ba4d72ff48b..75e4706ce9b7 100644 --- a/drivers/isdn/hisax/l3dss1.c +++ b/drivers/isdn/hisax/l3dss1.c @@ -2169,7 +2169,7 @@ static void l3dss1_redir_req_early(struct l3_process *pc, u8 pr, void *arg) /***********************************************/ /* handle special commands for this protocol. */ -/* Examples are call independant services like */ +/* Examples are call independent services like */ /* remote operations with dummy callref. */ /***********************************************/ static int l3dss1_cmd_global(struct PStack *st, isdn_ctrl *ic) diff --git a/drivers/isdn/hisax/l3ni1.c b/drivers/isdn/hisax/l3ni1.c index ca1caf72abe0..b9001580be28 100644 --- a/drivers/isdn/hisax/l3ni1.c +++ b/drivers/isdn/hisax/l3ni1.c @@ -2024,7 +2024,7 @@ static void l3ni1_redir_req_early(struct l3_process *pc, u8 pr, void *arg) /***********************************************/ /* handle special commands for this protocol. */ -/* Examples are call independant services like */ +/* Examples are call independent services like */ /* remote operations with dummy callref. */ /***********************************************/ static int l3ni1_cmd_global(struct PStack *st, isdn_ctrl *ic) diff --git a/drivers/isdn/hysdn/hysdn_boot.c b/drivers/isdn/hysdn/hysdn_boot.c index 25e4fe68fa3f..bf8756c0954f 100644 --- a/drivers/isdn/hysdn/hysdn_boot.c +++ b/drivers/isdn/hysdn/hysdn_boot.c @@ -78,7 +78,7 @@ DecryptBuf(struct boot_data *boot, int cnt) } /* DecryptBuf */ /********************************************************************************/ -/* pof_handle_data executes the required actions dependant on the active record */ +/* pof_handle_data executes the required actions dependent on the active record */ /* id. If successful 0 is returned, a negative value shows an error. */ /********************************************************************************/ static int diff --git a/drivers/media/radio/radio-zoltrix.c b/drivers/media/radio/radio-zoltrix.c index 2c309c5e8ed1..70a3ee406503 100644 --- a/drivers/media/radio/radio-zoltrix.c +++ b/drivers/media/radio/radio-zoltrix.c @@ -2,7 +2,7 @@ * (c) 1998 C. van Schaik <carl@leg.uct.ac.za> * * BUGS - * Due to the inconsistancy in reading from the signal flags + * Due to the inconsistency in reading from the signal flags * it is difficult to get an accurate tuned signal. * * It seems that the card is not linear to 0 volume. It cuts off diff --git a/drivers/mtd/chips/jedec.c b/drivers/mtd/chips/jedec.c index b95e3b58d895..337d0d22bfb0 100644 --- a/drivers/mtd/chips/jedec.c +++ b/drivers/mtd/chips/jedec.c @@ -608,7 +608,7 @@ static int flash_erase(struct mtd_info *mtd, struct erase_info *instr) /* Poll the flash for erasure completion, specs say this can take as long as 480 seconds to do all the sectors (for a 2 meg flash). - Erasure time is dependant on chip age, temp and wear.. */ + Erasure time is dependent on chip age, temp and wear.. */ /* This being a generic routine assumes a 32 bit bus. It does read32s and bundles interleved chips into the same grouping. This will work diff --git a/drivers/net/acenic.c b/drivers/net/acenic.c index bcf04cb0be4a..5d0ef4856b07 100644 --- a/drivers/net/acenic.c +++ b/drivers/net/acenic.c @@ -482,7 +482,7 @@ static inline void tasklet_init(struct tasklet_struct *tasklet, * * One advantagous side effect of this allocation approach is that the * entire rx processing can be done without holding any spin lock - * since the rx rings and registers are totally independant of the tx + * since the rx rings and registers are totally independent of the tx * ring and its registers. This of course includes the kmalloc's of * new skb's. Thus start_xmit can run in parallel with rx processing * and the memory allocation on SMP systems. diff --git a/drivers/net/declance.c b/drivers/net/declance.c index 98f558dd7f90..e57ccf08b4d6 100644 --- a/drivers/net/declance.c +++ b/drivers/net/declance.c @@ -279,7 +279,7 @@ struct lance_private { lp->tx_old - lp->tx_new-1) /* The lance control ports are at an absolute address, machine and tc-slot - * dependant. + * dependent. * DECstations do only 32-bit access and the LANCE uses 16 bit addresses, * so we have to give the structure an extra member making rap pointing * at the right address diff --git a/drivers/net/e1000/e1000_osdep.h b/drivers/net/e1000/e1000_osdep.h index aa1dd7dd8d01..0d68940f9b98 100644 --- a/drivers/net/e1000/e1000_osdep.h +++ b/drivers/net/e1000/e1000_osdep.h @@ -27,7 +27,7 @@ *******************************************************************************/ -/* glue for the OS independant part of e1000 +/* glue for the OS independent part of e1000 * includes register access macros */ diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c index b4fb6e2e8de3..38b55e119c90 100644 --- a/drivers/net/hamradio/6pack.c +++ b/drivers/net/hamradio/6pack.c @@ -113,7 +113,7 @@ struct sixpack { /* 6pack stuff */ unsigned char tx_delay; - unsigned char persistance; + unsigned char persistence; unsigned char slottime; unsigned char duplex; unsigned char led_state; @@ -302,7 +302,7 @@ static void sp_encaps(struct sixpack *sp, unsigned char *icp, int len) switch (p[0]) { case 1: sp->tx_delay = p[1]; return; - case 2: sp->persistance = p[1]; return; + case 2: sp->persistence = p[1]; return; case 3: sp->slottime = p[1]; return; case 4: /* ignored */ return; case 5: sp->duplex = p[1]; return; @@ -392,7 +392,7 @@ static void sp_xmit_on_air(unsigned long channel) random = random * 17 + 41; - if (((sp->status1 & SIXP_DCD_MASK) == 0) && (random < sp->persistance)) { + if (((sp->status1 & SIXP_DCD_MASK) == 0) && (random < sp->persistence)) { sp->led_state = 0x70; sp->tty->driver.write(sp->tty, 0, &sp->led_state, 1); sp->tx_enable = 1; @@ -469,7 +469,7 @@ static int sp_open(struct net_device *dev) sp->duplex = 0; sp->tx_delay = SIXP_TXDELAY; - sp->persistance = SIXP_PERSIST; + sp->persistence = SIXP_PERSIST; sp->slottime = SIXP_SLOTTIME; sp->led_state = 0x60; sp->status = 1; diff --git a/drivers/net/hamradio/scc.c b/drivers/net/hamradio/scc.c index 3487fac205e7..f1ed6647615c 100644 --- a/drivers/net/hamradio/scc.c +++ b/drivers/net/hamradio/scc.c @@ -1703,7 +1703,7 @@ static int scc_net_tx(struct sk_buff *skb, struct net_device *dev) /* * Start transmission if the trx state is idle or - * t_idle hasn't expired yet. Use dwait/persistance/slottime + * t_idle hasn't expired yet. Use dwait/persistence/slottime * algorithm for normal halfduplex operation. */ diff --git a/drivers/net/hamradio/yam.c b/drivers/net/hamradio/yam.c index d685b95b294c..66348071a670 100644 --- a/drivers/net/hamradio/yam.c +++ b/drivers/net/hamradio/yam.c @@ -34,7 +34,7 @@ * 0.5 F6FBB 01.08.98 Shared IRQs, /proc/net and network statistics * 0.6 F6FBB 25.08.98 Added 1200Bds format * 0.7 F6FBB 12.09.98 Added to the kernel configuration - * 0.8 F6FBB 14.10.98 Fixed slottime/persistance timing bug + * 0.8 F6FBB 14.10.98 Fixed slottime/persistence timing bug * OK1ZIA 2.09.01 Fixed "kfree_skb on hard IRQ" * using dev_kfree_skb_any(). (important in 2.4 kernel) * diff --git a/drivers/net/rrunner.c b/drivers/net/rrunner.c index c04703381230..e5465e5a08ec 100644 --- a/drivers/net/rrunner.c +++ b/drivers/net/rrunner.c @@ -386,7 +386,7 @@ static int rr_reset(struct net_device *dev) writel(0, ®s->CmdRing[i]); /* - * Why 32 ? is this not cache line size dependant? + * Why 32 ? is this not cache line size dependent? */ writel(RBURST_64|WBURST_64, ®s->PciState); wmb(); diff --git a/drivers/net/sgiseeq.c b/drivers/net/sgiseeq.c index 73b6b55f7475..a59f1872ed2a 100644 --- a/drivers/net/sgiseeq.c +++ b/drivers/net/sgiseeq.c @@ -524,7 +524,7 @@ static int sgiseeq_start_xmit(struct sk_buff *skb, struct net_device *dev) * 2) Do no allow the HPC to look at a new descriptor until * we have completely set up it's state. This means, do * not clear HPCDMA_EOX in the current last descritptor - * until the one we are adding looks consistant and could + * until the one we are adding looks consistent and could * be processes right now. * 3) The tx interrupt code must notice when we've added a new * entry and the HPC got to the end of the chain before we diff --git a/drivers/net/sk98lin/skvpd.c b/drivers/net/sk98lin/skvpd.c index f3683e3af4e8..0ac799a0f99e 100644 --- a/drivers/net/sk98lin/skvpd.c +++ b/drivers/net/sk98lin/skvpd.c @@ -88,7 +88,7 @@ * Revision 1.9 1998/09/16 07:33:52 malthoff * remove memcmp() by SK_MEMCMP and * memcpy() by SK_MEMCPY() to be - * independant from the 'C' Standard Library. + * independent from the 'C' Standard Library. * * Revision 1.8 1998/08/19 12:52:35 malthoff * compiler fix: use SK_VPD_KEY instead of S_VPD. diff --git a/drivers/net/sk98lin/skxmac2.c b/drivers/net/sk98lin/skxmac2.c index 32dc2aa38460..67c2fa53361a 100644 --- a/drivers/net/sk98lin/skxmac2.c +++ b/drivers/net/sk98lin/skxmac2.c @@ -194,7 +194,7 @@ * * Revision 1.12 1998/10/14 14:45:04 malthoff * Remove SKERR_SIRQ_E0xx and SKERR_SIRQ_E0xxMSG by - * SKERR_HWI_Exx and SKERR_HWI_E0xxMSG to be independant + * SKERR_HWI_Exx and SKERR_HWI_E0xxMSG to be independent * from the Sirq module. * * Revision 1.11 1998/10/14 13:59:01 gklug @@ -826,7 +826,7 @@ int Port) /* Port Index (MAC_1 + n) */ for (i = 0; i < 3; i++) { /* * The following 2 statements are together endianess - * independant. Remember this when changing. + * independent. Remember this when changing. */ SK_IN16(IoC, (B2_MAC_2 + Port * 8 + i * 2), &SWord); XM_OUT16(IoC, Port, (XM_SA + i * 2), SWord); diff --git a/drivers/net/skfp/cfm.c b/drivers/net/skfp/cfm.c index 7a51b765b4a5..91eb36f3ec3a 100644 --- a/drivers/net/skfp/cfm.c +++ b/drivers/net/skfp/cfm.c @@ -21,15 +21,15 @@ */ /* - * Hardware independant state machine implemantation + * Hardware independent state machine implemantation * The following external SMT functions are referenced : * * queue_event() * - * The following external HW dependant functions are referenced : + * The following external HW dependent functions are referenced : * config_mux() * - * The following HW dependant events are required : + * The following HW dependent events are required : * NONE */ diff --git a/drivers/net/skfp/ecm.c b/drivers/net/skfp/ecm.c index 9dcca7f5581e..7eaab1c3f9d2 100644 --- a/drivers/net/skfp/ecm.c +++ b/drivers/net/skfp/ecm.c @@ -17,23 +17,23 @@ /* SMT ECM Entity Coordination Management - Hardware independant state machine + Hardware independent state machine */ /* - * Hardware independant state machine implemantation + * Hardware independent state machine implemantation * The following external SMT functions are referenced : * * queue_event() * smt_timer_start() * smt_timer_stop() * - * The following external HW dependant functions are referenced : + * The following external HW dependent functions are referenced : * sm_pm_bypass_req() * sm_pm_ls_latch() * sm_pm_get_ls() * - * The following HW dependant events are required : + * The following HW dependent events are required : * NONE * */ diff --git a/drivers/net/skfp/h/osdef1st.h b/drivers/net/skfp/h/osdef1st.h index a6866248abc0..5359eb53008d 100644 --- a/drivers/net/skfp/h/osdef1st.h +++ b/drivers/net/skfp/h/osdef1st.h @@ -13,7 +13,7 @@ ******************************************************************************/ /* - * Operating system-dependant definitions that have to be defined + * Operating system-dependent definitions that have to be defined * before any other header files are included. */ diff --git a/drivers/net/skfp/pcmplc.c b/drivers/net/skfp/pcmplc.c index b19b2a81b6ac..4be8f3a9e8f4 100644 --- a/drivers/net/skfp/pcmplc.c +++ b/drivers/net/skfp/pcmplc.c @@ -20,19 +20,19 @@ */ /* - * Hardware independant state machine implemantation + * Hardware independent state machine implemantation * The following external SMT functions are referenced : * * queue_event() * smt_timer_start() * smt_timer_stop() * - * The following external HW dependant functions are referenced : + * The following external HW dependent functions are referenced : * sm_pm_control() * sm_ph_linestate() * sm_pm_ls_latch() * - * The following HW dependant events are required : + * The following HW dependent events are required : * PC_QLS * PC_ILS * PC_HLS @@ -714,7 +714,7 @@ int cmd; mib = phy->mib ; /* - * general transitions independant of state + * general transitions independent of state */ switch (cmd) { case PC_STOP : diff --git a/drivers/net/skfp/rmt.c b/drivers/net/skfp/rmt.c index 473eb0c9cdfe..5771dc42ced8 100644 --- a/drivers/net/skfp/rmt.c +++ b/drivers/net/skfp/rmt.c @@ -20,18 +20,18 @@ */ /* - * Hardware independant state machine implemantation + * Hardware independent state machine implemantation * The following external SMT functions are referenced : * * queue_event() * smt_timer_start() * smt_timer_stop() * - * The following external HW dependant functions are referenced : + * The following external HW dependent functions are referenced : * sm_ma_control() * sm_mac_check_beacon_claim() * - * The following HW dependant events are required : + * The following HW dependent events are required : * RM_RING_OP * RM_RING_NON_OP * RM_MY_BEACON diff --git a/drivers/net/skfp/skfddi.c b/drivers/net/skfp/skfddi.c index 52f9d11ceba6..4a430f99b947 100644 --- a/drivers/net/skfp/skfddi.c +++ b/drivers/net/skfp/skfddi.c @@ -33,7 +33,7 @@ * The driver architecture is based on the DEC FDDI driver by * Lawrence V. Stefani and several ethernet drivers. * I also used an existing Windows NT miniport driver. - * All hardware dependant fuctions are handled by the SysKonnect + * All hardware dependent fuctions are handled by the SysKonnect * Hardware Module. * The only headerfiles that are directly related to this source * are skfddi.c, h/types.h, h/osdef1st.h, h/targetos.h. @@ -1729,7 +1729,7 @@ u_long dma_master(struct s_smc * smc, void *virt, int len, int flag) * dma_complete * * The hardware module calls this routine when it has completed a DMA - * transfer. If the operating system dependant module has set up the DMA + * transfer. If the operating system dependent module has set up the DMA * channel via dma_master() (e.g. Windows NT or AIX) it should clean up * the DMA channel. * Args diff --git a/drivers/net/wan/lmc/lmc_main.c b/drivers/net/wan/lmc/lmc_main.c index 6f65949dd7ea..bf13c8182eb8 100644 --- a/drivers/net/wan/lmc/lmc_main.c +++ b/drivers/net/wan/lmc/lmc_main.c @@ -1074,7 +1074,7 @@ int lmc_probe (struct net_device *dev) /*fold00*/ * This prevents taking someone else's device. * * Check either the subvendor or the subdevice, some systems reverse - * the setting in the bois, seems to be version and arch dependant? + * the setting in the bois, seems to be version and arch dependent? * Fix the two variables * */ diff --git a/drivers/net/wan/lmc/lmc_ver.h b/drivers/net/wan/lmc/lmc_ver.h index 1e9e2f5f7ddb..dd1c592813e4 100644 --- a/drivers/net/wan/lmc/lmc_ver.h +++ b/drivers/net/wan/lmc/lmc_ver.h @@ -25,7 +25,7 @@ * made the souce code not only hard to read but version problems hard * to track down. If I'm overiding a function/etc with something in * this file it will be prefixed by "LMC_" which will mean look - * here for the version dependant change that's been done. + * here for the version dependent change that's been done. * */ diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c index d1e1ae8f6c1b..ec86ccb3bfda 100644 --- a/drivers/net/wireless/airo.c +++ b/drivers/net/wireless/airo.c @@ -5144,7 +5144,7 @@ static int airo_set_scan(struct net_device *dev, /*------------------------------------------------------------------*/ /* - * Translate scan data returned from the card to a card independant + * Translate scan data returned from the card to a card independent * format that the Wireless Tools will understand - Jean II */ static inline char *airo_translate_scan(struct net_device *dev, diff --git a/drivers/net/wireless/orinoco.h b/drivers/net/wireless/orinoco.h index 8317270a46da..8608626def40 100644 --- a/drivers/net/wireless/orinoco.h +++ b/drivers/net/wireless/orinoco.h @@ -36,7 +36,7 @@ struct orinoco_key { struct orinoco_private { - void *card; /* Pointer to card dependant structure */ + void *card; /* Pointer to card dependent structure */ int (*hard_reset)(struct orinoco_private *); /* Synchronisation stuff */ diff --git a/drivers/sbus/char/aurora.c b/drivers/sbus/char/aurora.c index cb00080d2fc9..1a27aa713c88 100644 --- a/drivers/sbus/char/aurora.c +++ b/drivers/sbus/char/aurora.c @@ -1046,7 +1046,7 @@ static void aurora_change_speed(struct Aurora_board *bp, struct Aurora_port *por &bp->r[chip]->r[CD180_MSVR]); } - /* Now we must calculate some speed dependant things. */ + /* Now we must calculate some speed dependent things. */ /* Set baud rate for port. */ tmp = (((bp->oscfreq + baud/2) / baud + diff --git a/drivers/sbus/char/bbc_envctrl.c b/drivers/sbus/char/bbc_envctrl.c index de7c9eadb63d..a5ac67cc498f 100644 --- a/drivers/sbus/char/bbc_envctrl.c +++ b/drivers/sbus/char/bbc_envctrl.c @@ -30,7 +30,7 @@ static int errno; * * The max1617 is capable of being programmed with power-off * temperature values, one low limit and one high limit. These - * can be controlled independantly for the cpu or ambient temperature. + * can be controlled independently for the cpu or ambient temperature. * If a limit is violated, the power is simply shut off. The frequency * with which the max1617 does temperature sampling can be controlled * as well. diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c index 416cf07afb38..8e3ad622cb8b 100644 --- a/drivers/scsi/aacraid/aachba.c +++ b/drivers/scsi/aacraid/aachba.c @@ -392,8 +392,8 @@ static char *container_types[] = { * Arguments: [1] pointer to void [1] int * * Purpose: Sets SCSI inquiry data strings for vendor, product - * and revision level. Allows strings to be set in platform dependant - * files instead of in OS dependant driver source. + * and revision level. Allows strings to be set in platform dependent + * files instead of in OS dependent driver source. */ static void setinqstr(int devtype, void *data, int tindex) diff --git a/drivers/scsi/aic7xxx/aic79xx_inline.h b/drivers/scsi/aic7xxx/aic79xx_inline.h index e41701472bfc..bdca5c17b33f 100644 --- a/drivers/scsi/aic7xxx/aic79xx_inline.h +++ b/drivers/scsi/aic7xxx/aic79xx_inline.h @@ -769,7 +769,7 @@ ahd_queue_scb(struct ahd_softc *ahd, struct scb *scb) ahd_setup_scb_common(ahd, scb); /* - * Make sure our data is consistant from the + * Make sure our data is consistent from the * perspective of the adapter. */ ahd_sync_scb(ahd, scb, BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.h b/drivers/scsi/aic7xxx/aic79xx_osm.h index 5913588f86d2..e7c7c0896113 100644 --- a/drivers/scsi/aic7xxx/aic79xx_osm.h +++ b/drivers/scsi/aic7xxx/aic79xx_osm.h @@ -321,7 +321,7 @@ struct ahd_cmd { /* * A per probed device structure used to deal with some error recovery * scenarios that the Linux mid-layer code just doesn't know how to - * handle. The structure allocated for a device only becomes persistant + * handle. The structure allocated for a device only becomes persistent * after a successfully completed inquiry command to the target when * that inquiry data indicates a lun is present. */ diff --git a/drivers/scsi/aic7xxx/aic7xxx_inline.h b/drivers/scsi/aic7xxx/aic7xxx_inline.h index 53de3904b10b..c38b0cb97d36 100644 --- a/drivers/scsi/aic7xxx/aic7xxx_inline.h +++ b/drivers/scsi/aic7xxx/aic7xxx_inline.h @@ -460,7 +460,7 @@ ahc_queue_scb(struct ahc_softc *ahc, struct scb *scb) ahc->qinfifo[ahc->qinfifonext++] = scb->hscb->tag; /* - * Make sure our data is consistant from the + * Make sure our data is consistent from the * perspective of the adapter. */ ahc_sync_scb(ahc, scb, BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.h b/drivers/scsi/aic7xxx/aic7xxx_osm.h index 4baa42a415b6..e400114b9ca7 100644 --- a/drivers/scsi/aic7xxx/aic7xxx_osm.h +++ b/drivers/scsi/aic7xxx/aic7xxx_osm.h @@ -334,7 +334,7 @@ struct ahc_cmd { /* * A per probed device structure used to deal with some error recovery * scenarios that the Linux mid-layer code just doesn't know how to - * handle. The structure allocated for a device only becomes persistant + * handle. The structure allocated for a device only becomes persistent * after a successfully completed inquiry command to the target when * that inquiry data indicates a lun is present. */ diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c index bb942cd73b6e..640ba4d96e69 100644 --- a/drivers/scsi/megaraid.c +++ b/drivers/scsi/megaraid.c @@ -443,7 +443,7 @@ * Mon Aug 6 14:59:29 BST 2001 - "Michael Johnson" <johnsom@home.com> * * Make the HP print formatting and check for buggy firmware runtime not - * ifdef dependant. + * ifdef dependent. * * * Version 1.17d diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c index 7c781dbfc344..dc61815d69e2 100644 --- a/drivers/scsi/qla1280.c +++ b/drivers/scsi/qla1280.c @@ -107,7 +107,7 @@ - Provide compat macros for pci_enable_device(), pci_find_subsys() and scsi_set_pci_device() - Call scsi_set_pci_device() for all devices - - Reduce size of kernel version dependant device probe code + - Reduce size of kernel version dependent device probe code - Move duplicate probe/init code to separate function - Handle error if qla1280_mem_alloc() fails - Kill OFFSET() macro and use Linux's PCI definitions instead diff --git a/drivers/scsi/sym53c8xx_2/sym_glue.c b/drivers/scsi/sym53c8xx_2/sym_glue.c index 0356142db1aa..df8fa6f3de3f 100644 --- a/drivers/scsi/sym53c8xx_2/sym_glue.c +++ b/drivers/scsi/sym53c8xx_2/sym_glue.c @@ -1843,7 +1843,7 @@ static void sym_free_resources(hcb_p np) pci_unmap_mem(np->s.ram_va, np->ram_ws); #endif /* - * Free O/S independant resources. + * Free O/S independent resources. */ sym_hcb_free(np); @@ -2043,7 +2043,7 @@ sym_attach (Scsi_Host_Template *tpnt, int unit, sym_device *dev) } /* - * Perform O/S independant stuff. + * Perform O/S independent stuff. */ if (sym_hcb_attach(np, fw, nvram)) goto attach_failed; diff --git a/drivers/scsi/sym53c8xx_2/sym_glue.h b/drivers/scsi/sym53c8xx_2/sym_glue.h index 94bcef34d906..b711718b9df6 100644 --- a/drivers/scsi/sym53c8xx_2/sym_glue.h +++ b/drivers/scsi/sym53c8xx_2/sym_glue.h @@ -188,7 +188,7 @@ typedef struct sym_sccb *sccb_p; typedef struct sym_shcb *shcb_p; /* - * Define a reference to the O/S dependant IO request. + * Define a reference to the O/S dependent IO request. */ typedef Scsi_Cmnd *cam_ccb_p; /* Generic */ typedef Scsi_Cmnd *cam_scsiio_p;/* SCSI I/O */ diff --git a/drivers/usb/misc/atmsar.c b/drivers/usb/misc/atmsar.c index 5f6a7f033361..fce7041d51a2 100644 --- a/drivers/usb/misc/atmsar.c +++ b/drivers/usb/misc/atmsar.c @@ -45,7 +45,7 @@ * - No more in-buffer rewriting for cloned buffers. * - Removed the PII specific CFLAGS in the Makefile. * - * 0.2.1: - removed dependancy on alloc_tx. tis presented problems when + * 0.2.1: - removed dependency on alloc_tx. tis presented problems when * using this with the br2684 code. * * 0.2: - added AAL0 reassembly diff --git a/drivers/usb/serial/safe_serial.c b/drivers/usb/serial/safe_serial.c index fd8ae959defb..3cce9b7d1e73 100644 --- a/drivers/usb/serial/safe_serial.c +++ b/drivers/usb/serial/safe_serial.c @@ -256,7 +256,7 @@ static void safe_read_bulk_callback (struct urb *urb, struct pt_regs *regs) } tty_flip_buffer_push (port->tty); } else { - err ("%s - inconsistant lengths %d:%d", __FUNCTION__, + err ("%s - inconsistent lengths %d:%d", __FUNCTION__, actual_length, length); } } else { diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c index aa4af2b0a948..5fb910c1a6e2 100644 --- a/drivers/usb/storage/usb.c +++ b/drivers/usb/storage/usb.c @@ -706,7 +706,7 @@ static int storage_probe(struct usb_interface *intf, /* * Set the handler pointers based on the protocol - * Again, this data is persistant across reattachments + * Again, this data is persistent across reattachments */ switch (ss->protocol) { case US_PR_CB: diff --git a/drivers/video/skeletonfb.c b/drivers/video/skeletonfb.c index 57b69168e37e..4d0bd916ec75 100644 --- a/drivers/video/skeletonfb.c +++ b/drivers/video/skeletonfb.c @@ -513,7 +513,7 @@ void xxxfb_poll(struct fb_info *info, poll_table *wait) * for a graphics card take a specific amount of time. * Often we have to wait for the accelerator to finish * its operation before we can write to the framebuffer - * so we can have consistant display output. + * so we can have consistent display output. * * @info: frame buffer structure that represents a single frame buffer */ diff --git a/fs/befs/ChangeLog b/fs/befs/ChangeLog index 8e09a0bd8ebb..6774a4e815b2 100644 --- a/fs/befs/ChangeLog +++ b/fs/befs/ChangeLog @@ -60,7 +60,7 @@ Version 0.63 (2002-01-31) * Documentation improvements in source. [WD] -* Makefile fix for independant module when CONFIG_MODVERSION is set in +* Makefile fix for independent module when CONFIG_MODVERSION is set in kernel config [Pavel Roskin <proski@gnu.org>] * Compile warning fix for namei.c. [Sergey S. Kostyliov <rathamahata@php4.ru>] diff --git a/fs/partitions/ldm.c b/fs/partitions/ldm.c index 9a33c941cd5c..e0d448b3a6c9 100644 --- a/fs/partitions/ldm.c +++ b/fs/partitions/ldm.c @@ -510,7 +510,7 @@ static BOOL ldm_validate_vmdb (struct block_device *bdev, unsigned long base, /* Are there uncommitted transactions? */ if (BE16(data + 0x10) != 0x01) { - ldm_crit ("Database is not in a consistant state. Aborting."); + ldm_crit ("Database is not in a consistent state. Aborting."); goto out; } diff --git a/include/asm-alpha/pci.h b/include/asm-alpha/pci.h index 923f913e544a..472a96bdd49b 100644 --- a/include/asm-alpha/pci.h +++ b/include/asm-alpha/pci.h @@ -68,16 +68,16 @@ extern inline void pcibios_penalize_isa_irq(int irq) decisions. */ #define PCI_DMA_BUS_IS_PHYS 0 -/* Allocate and map kernel buffer using consistant mode DMA for PCI +/* Allocate and map kernel buffer using consistent mode DMA for PCI device. Returns non-NULL cpu-view pointer to the buffer if successful and sets *DMA_ADDRP to the pci side dma address as well, else DMA_ADDRP is undefined. */ extern void *pci_alloc_consistent(struct pci_dev *, size_t, dma_addr_t *); -/* Free and unmap a consistant DMA buffer. CPU_ADDR and DMA_ADDR must - be values that were returned from pci_alloc_consistant. SIZE must - be the same as what as passed into pci_alloc_consistant. +/* Free and unmap a consistent DMA buffer. CPU_ADDR and DMA_ADDR must + be values that were returned from pci_alloc_consistent. SIZE must + be the same as what as passed into pci_alloc_consistent. References to the memory and mappings assosciated with CPU_ADDR or DMA_ADDR past this call are illegal. */ @@ -139,7 +139,7 @@ extern int pci_map_sg(struct pci_dev *, struct scatterlist *, int, int); extern void pci_unmap_sg(struct pci_dev *, struct scatterlist *, int, int); -/* Make physical memory consistant for a single streaming mode DMA +/* Make physical memory consistent for a single streaming mode DMA translation after a transfer. If you perform a pci_map_single() but wish to interrogate the @@ -155,7 +155,7 @@ pci_dma_sync_single(struct pci_dev *dev, dma_addr_t dma_addr, long size, /* Nothing to do. */ } -/* Make physical memory consistant for a set of streaming mode DMA +/* Make physical memory consistent for a set of streaming mode DMA translations after a transfer. The same as pci_dma_sync_single but for a scatter-gather list, same rules and usage. */ diff --git a/include/asm-cris/io.h b/include/asm-cris/io.h index 607b6291b366..82a06f841c9f 100644 --- a/include/asm-cris/io.h +++ b/include/asm-cris/io.h @@ -246,7 +246,7 @@ extern inline void * ioremap (unsigned long offset, unsigned long size) #define eth_io_copy_and_sum(a,b,c,d) eth_copy_and_sum((a),(void *)(b),(c),(d)) -/* The following is junk needed for the arch-independant code but which +/* The following is junk needed for the arch-independent code but which * we never use in the CRIS port */ diff --git a/include/asm-generic/rmap.h b/include/asm-generic/rmap.h index d96b2e3fed98..5932b91fa2e7 100644 --- a/include/asm-generic/rmap.h +++ b/include/asm-generic/rmap.h @@ -3,7 +3,7 @@ /* * linux/include/asm-generic/rmap.h * - * Architecture dependant parts of the reverse mapping code, + * Architecture dependent parts of the reverse mapping code, * this version should work for most architectures with a * 'normal' page table layout. * diff --git a/include/asm-generic/rtc.h b/include/asm-generic/rtc.h index 845641b06b0c..001667ef0d35 100644 --- a/include/asm-generic/rtc.h +++ b/include/asm-generic/rtc.h @@ -147,7 +147,7 @@ static inline int set_rtc_time(struct rtc_time *time) yrs = 73; } #endif - /* These limits and adjustments are independant of + /* These limits and adjustments are independent of * whether the chip is in binary mode or not. */ if (yrs > 169) { diff --git a/include/asm-mips/isadep.h b/include/asm-mips/isadep.h index 3cd1eb8eb58a..b3453bb3ba34 100644 --- a/include/asm-mips/isadep.h +++ b/include/asm-mips/isadep.h @@ -1,5 +1,5 @@ /* - * Various ISA level dependant constants. + * Various ISA level dependent constants. * Most of the following constants reflect the different layout * of Coprocessor 0 registers. * diff --git a/include/asm-mips64/r10kcache.h b/include/asm-mips64/r10kcache.h index 564ac6cc79aa..984f2f6e6ea2 100644 --- a/include/asm-mips64/r10kcache.h +++ b/include/asm-mips64/r10kcache.h @@ -25,7 +25,7 @@ #define ic_lsize 64 #define dc_lsize 32 -/* These are configuration dependant. */ +/* These are configuration dependent. */ #define scache_size() ({ \ unsigned long __res; \ __res = (read_32bit_cp0_register(CP0_CONFIG) >> 16) & 3; \ diff --git a/include/asm-ppc/io.h b/include/asm-ppc/io.h index 29eaaae63187..1616aede8ce5 100644 --- a/include/asm-ppc/io.h +++ b/include/asm-ppc/io.h @@ -36,7 +36,7 @@ #define _IO_BASE isa_io_base #define _ISA_MEM_BASE isa_mem_base #define PCI_DRAM_OFFSET pci_dram_offset -#endif /* Platform-dependant I/O */ +#endif /* Platform-dependent I/O */ extern unsigned long isa_io_base; extern unsigned long isa_mem_base; diff --git a/include/asm-ppc/system.h b/include/asm-ppc/system.h index ca47022e92ea..837f9bc6bab5 100644 --- a/include/asm-ppc/system.h +++ b/include/asm-ppc/system.h @@ -22,7 +22,7 @@ * mb() prevents loads and stores being reordered across this point. * rmb() prevents loads being reordered across this point. * wmb() prevents stores being reordered across this point. - * read_barrier_depends() prevents data-dependant loads being reordered + * read_barrier_depends() prevents data-dependent loads being reordered * across this point (nop on PPC). * * We can use the eieio instruction for wmb, but since it doesn't diff --git a/include/asm-ppc64/system.h b/include/asm-ppc64/system.h index 68f31b97c314..c78f830ed823 100644 --- a/include/asm-ppc64/system.h +++ b/include/asm-ppc64/system.h @@ -25,7 +25,7 @@ * mb() prevents loads and stores being reordered across this point. * rmb() prevents loads being reordered across this point. * wmb() prevents stores being reordered across this point. - * read_barrier_depends() prevents data-dependant loads being reordered + * read_barrier_depends() prevents data-dependent loads being reordered * across this point (nop on PPC). * * We can use the eieio instruction for wmb, but since it doesn't diff --git a/include/asm-v850/pci.h b/include/asm-v850/pci.h index 5ec5944d2b37..b915819c609b 100644 --- a/include/asm-v850/pci.h +++ b/include/asm-v850/pci.h @@ -36,7 +36,7 @@ extern void pci_unmap_single (struct pci_dev *pdev, dma_addr_t dma_addr, size_t size, int dir); -/* Make physical memory consistant for a single streaming mode DMA +/* Make physical memory consistent for a single streaming mode DMA translation after a transfer. If you perform a pci_map_single() but wish to interrogate the diff --git a/include/linux/agp_backend.h b/include/linux/agp_backend.h index e8fec2776624..36568e4a3d14 100644 --- a/include/linux/agp_backend.h +++ b/include/linux/agp_backend.h @@ -160,7 +160,7 @@ extern agp_memory *agp_allocate_memory(size_t, u32); * an u32 argument of the type of memory to be allocated. * Every agp bridge device will allow you to allocate * AGP_NORMAL_MEMORY which maps to physical ram. Any other - * type is device dependant. + * type is device dependent. * * It returns NULL whenever memory is unavailable. * diff --git a/include/linux/apm_bios.h b/include/linux/apm_bios.h index ceffd587b7a8..b3b981af768d 100644 --- a/include/linux/apm_bios.h +++ b/include/linux/apm_bios.h @@ -45,7 +45,7 @@ struct apm_bios_info { #define APM_BIOS_DISENGAGED 0x0010 /* - * Data for APM that is persistant across module unload/load + * Data for APM that is persistent across module unload/load */ struct apm_info { struct apm_bios_info bios; diff --git a/include/linux/isdnif.h b/include/linux/isdnif.h index fed344ec7a41..06265081fa48 100644 --- a/include/linux/isdnif.h +++ b/include/linux/isdnif.h @@ -62,7 +62,7 @@ /* */ /* The proceed command holds a incoming call in a state to leave processes */ /* enough time to check whether ist should be accepted. */ -/* The PROT_IO Command extends the interface to make protocol dependant */ +/* The PROT_IO Command extends the interface to make protocol dependent */ /* features available (call diversion, call waiting...). */ /* */ /* The PROT_IO Command is executed with the desired driver id and the arg */ diff --git a/include/linux/sdla_x25.h b/include/linux/sdla_x25.h index 9827e74faaf2..c110c1a835f7 100644 --- a/include/linux/sdla_x25.h +++ b/include/linux/sdla_x25.h @@ -157,7 +157,7 @@ typedef struct X25Cmd #define X25RES_PROTO_VIOLATION 0x41 /* protocol violation occured */ #define X25RES_PKT_TIMEOUT 0x42 /* X.25 packet time out */ #define X25RES_PKT_RETRY_LIMIT 0x43 /* X.25 packet retry limit exceeded */ -/*----- Command-dependant results -----*/ +/*----- Command-dependent results -----*/ #define X25RES_LINK_DISC 0x00 /* HDLC_LINK_STATUS */ #define X25RES_LINK_IN_ABM 0x01 /* HDLC_LINK_STATUS */ #define X25RES_NO_DATA 0x01 /* HDLC_READ/READ_TRACE_DATA*/ diff --git a/net/irda/iriap.c b/net/irda/iriap.c index edf9a77c078c..d996cb5e0496 100644 --- a/net/irda/iriap.c +++ b/net/irda/iriap.c @@ -990,7 +990,7 @@ int irias_proc_read(char *buf, char **start, off_t offset, int len) len += sprintf(buf+len, "\n"); /* Careful for priority inversions here ! - * All other uses of attrib spinlock are independant of + * All other uses of attrib spinlock are independent of * the object spinlock, so we are safe. Jean II */ spin_lock(&obj->attribs->hb_spinlock); diff --git a/net/irda/irlmp.c b/net/irda/irlmp.c index ba525b82f994..3ab62fa1d884 100644 --- a/net/irda/irlmp.c +++ b/net/irda/irlmp.c @@ -1623,7 +1623,7 @@ int irlmp_slsap_inuse(__u8 slsap_sel) ASSERT(lap->magic == LMP_LAP_MAGIC, return TRUE;); /* Careful for priority inversions here ! - * All other uses of attrib spinlock are independant of + * All other uses of attrib spinlock are independent of * the object spinlock, so we are safe. Jean II */ spin_lock(&lap->lsaps->hb_spinlock); @@ -1786,7 +1786,7 @@ int irlmp_proc_read(char *buf, char **start, off_t offset, int len) len += sprintf(buf+len, "\n"); /* Careful for priority inversions here ! - * All other uses of attrib spinlock are independant of + * All other uses of attrib spinlock are independent of * the object spinlock, so we are safe. Jean II */ spin_lock(&lap->lsaps->hb_spinlock); diff --git a/net/irda/irnet/irnet.h b/net/irda/irnet/irnet.h index 612030769391..97381500fd20 100644 --- a/net/irda/irnet/irnet.h +++ b/net/irda/irnet/irnet.h @@ -284,7 +284,7 @@ /* * This set of flags enable and disable all the various warning, * error and debug message of this driver. - * Each section can be enabled and disabled independantly + * Each section can be enabled and disabled independently */ /* In the PPP part */ #define DEBUG_CTRL_TRACE 0 /* Control channel */ diff --git a/sound/core/hwdep.c b/sound/core/hwdep.c index 5826ea7d5419..be0245dbfdf0 100644 --- a/sound/core/hwdep.c +++ b/sound/core/hwdep.c @@ -334,7 +334,7 @@ static int snd_hwdep_dev_register(snd_device_t *device) if ((err = snd_register_device(SNDRV_DEVICE_TYPE_HWDEP, hwdep->card, hwdep->device, &snd_hwdep_reg, name)) < 0) { - snd_printk(KERN_ERR "unable to register hardware dependant device %i:%i\n", + snd_printk(KERN_ERR "unable to register hardware dependent device %i:%i\n", hwdep->card->number, hwdep->device); snd_hwdep_devices[idx] = NULL; up(®ister_mutex); diff --git a/sound/core/seq/seq_midi_emul.c b/sound/core/seq/seq_midi_emul.c index 8afa4df16428..0bc8ee757b05 100644 --- a/sound/core/seq/seq_midi_emul.c +++ b/sound/core/seq/seq_midi_emul.c @@ -60,7 +60,7 @@ static void reset_all_channels(snd_midi_channel_set_t *chset); /* - * Process an event in a driver independant way. This means dealing + * Process an event in a driver independent way. This means dealing * with RPN, NRPN, SysEx etc that are defined for common midi applications * such as GM, GS and XG. * There modes that this module will run in are: @@ -258,7 +258,7 @@ note_off(snd_midi_op_t *ops, void *drv, snd_midi_channel_t *chan, int note, int } /* - * Do all driver independant operations for this controler and pass + * Do all driver independent operations for this controler and pass * events that need to take place immediately to the driver. */ static void diff --git a/sound/oss/ac97_codec.c b/sound/oss/ac97_codec.c index 62aa94ef6df2..689cac0755ec 100644 --- a/sound/oss/ac97_codec.c +++ b/sound/oss/ac97_codec.c @@ -446,7 +446,7 @@ static void ac97_set_mixer(struct ac97_codec *codec, unsigned int oss_mixer, uns } /* read or write the recmask, the ac97 can really have left and right recording - inputs independantly set, but OSS doesn't seem to want us to express that to + inputs independently set, but OSS doesn't seem to want us to express that to the user. the caller guarantees that we have a supported bit set, and they must be holding the card's spinlock */ static int ac97_recmask_io(struct ac97_codec *codec, int rw, int mask) diff --git a/sound/oss/maestro.c b/sound/oss/maestro.c index 287b0619a414..7a22f5f26e84 100644 --- a/sound/oss/maestro.c +++ b/sound/oss/maestro.c @@ -793,7 +793,7 @@ static unsigned int ac97_oss_rm[] = { /* read or write the recmask the ac97 can really have left and right recording - inputs independantly set, but OSS doesn't seem to + inputs independently set, but OSS doesn't seem to want us to express that to the user. the caller guarantees that we have a supported bit set, and they must be holding the card's spinlock */ |