This patch fixes these seven words from lines 6-11 of spell-fix.txt.
aquire -> acquire
accross -> across
actons -> actions
adapater -> adapter
adatper -> adapter
additionnal -> additional
Addtional -> Additional
arch/m68k/q40/q40ints.c | 2 +-
drivers/char/vt.c | 2 +-
drivers/ide/pci/sis5513.c | 6 +++---
drivers/isdn/eicon/adapter.h | 2 +-
drivers/isdn/hardware/eicon/di.h | 2 +-
drivers/isdn/i4l/isdn_ciscohdlck.c | 4 ++--
drivers/media/dvb/frontends/alps_tdmb7.c | 2 +-
drivers/media/video/bttvp.h | 2 +-
drivers/net/sk98lin/h/skgepnmi.h | 2 +-
drivers/net/skfp/drvfbi.c | 2 +-
drivers/net/skfp/hwmtm.c | 2 +-
drivers/net/wan/sdla_chdlc.c | 2 +-
drivers/net/wan/sdla_fr.c | 2 +-
drivers/net/wan/sdla_ppp.c | 2 +-
drivers/scsi/sym53c8xx.c | 4 ++--
drivers/scsi/sym53c8xx_2/sym_defs.h | 2 +-
drivers/scsi/sym53c8xx_2/sym_glue.c | 2 +-
drivers/scsi/sym53c8xx_2/sym_hipd.c | 2 +-
drivers/scsi/sym53c8xx_2/sym_misc.c | 2 +-
drivers/scsi/sym53c8xx_defs.h | 2 +-
drivers/video/sis/sisfb.h | 2 +-
drivers/video/sis/vgatypes.h | 2 +-
include/asm-m68knommu/mcftimer.h | 2 +-
include/linux/sisfb.h | 2 +-
sound/oss/dmabuf.c | 2 +-
25 files changed, 29 insertions(+), 29 deletions(-)
diff -ur 2.5-current/arch/m68k/q40/q40ints.c linux/arch/m68k/q40/q40ints.c
--- 2.5-current/arch/m68k/q40/q40ints.c Mon Mar 3 07:23:06 2003
+++ linux/arch/m68k/q40/q40ints.c Mon Mar 3 08:50:27 2003
@@ -439,7 +439,7 @@
{
/* disable ISA iqs : only do something if the driver has been
* verified to be Q40 "compatible" - right now IDE, NE2K
- * Any driver should not attempt to sleep accross disable_irq !!
+ * Any driver should not attempt to sleep across disable_irq !!
*/
if ( irq>=5 && irq<=15 ) {
diff -ur 2.5-current/drivers/char/vt.c linux/drivers/char/vt.c
--- 2.5-current/drivers/char/vt.c Mon Mar 3 07:23:05 2003
+++ linux/drivers/char/vt.c Mon Mar 3 09:12:37 2003
@@ -701,7 +701,7 @@
inline int resize_screen(int currcons, int width, int height)
{
- /* Resizes the resolution of the display adapater */
+ /* Resizes the resolution of the display adapter */
int err = 0;
if (vcmode != KD_GRAPHICS && sw->con_resize)
diff -ur 2.5-current/drivers/ide/pci/sis5513.c linux/drivers/ide/pci/sis5513.c
--- 2.5-current/drivers/ide/pci/sis5513.c Mon Mar 3 07:22:54 2003
+++ linux/drivers/ide/pci/sis5513.c Mon Mar 3 08:50:44 2003
@@ -185,7 +185,7 @@
{ "SiS5511", PCI_DEVICE_ID_SI_5511, ATA_16, 0},
};
-/* Cycle time bits and values vary accross chip dma capabilities
+/* Cycle time bits and values vary across chip dma capabilities
These three arrays hold the register layout and the values to set.
Indexed by chipset_family and (dma_mode - XFER_UDMA_0) */
@@ -202,7 +202,7 @@
{15,10,7,5,3,2,1}, /* ATA_133a (earliest 691 southbridges) */
{15,10,7,5,3,2,1}, /* ATA_133 */
};
-/* CRC Valid Setup Time vary accross IDE clock setting 33/66/100/133
+/* CRC Valid Setup Time vary across IDE clock setting 33/66/100/133
See SiS962 data sheet for more detail */
static u8 cvs_time_value[][XFER_UDMA_6 - XFER_UDMA_0 + 1] = {
{0,0,0,0,0,0,0}, /* no udma */
@@ -214,7 +214,7 @@
{9,6,4,2,2,2,2},
{9,6,4,2,2,2,2},
};
-/* Initialize time, Active time, Recovery time vary accross
+/* Initialize time, Active time, Recovery time vary across
IDE clock settings. These 3 arrays hold the register value
for PIO0/1/2/3/4 and DMA0/1/2 mode in order */
static u8 ini_time_value[][8] = {
diff -ur 2.5-current/drivers/isdn/eicon/adapter.h linux/drivers/isdn/eicon/adapter.h
--- 2.5-current/drivers/isdn/eicon/adapter.h Mon Mar 3 07:23:06 2003
+++ linux/drivers/isdn/eicon/adapter.h Mon Mar 3 09:12:29 2003
@@ -25,7 +25,7 @@
#define RMORE 0x80
/* structure for all information we have to keep on a per */
- /* adapater basis */
+ /* adapter basis */
typedef struct adapter_s ADAPTER;
diff -ur 2.5-current/drivers/isdn/hardware/eicon/di.h linux/drivers/isdn/hardware/eicon/di.h
--- 2.5-current/drivers/isdn/hardware/eicon/di.h Mon Mar 3 07:23:01 2003
+++ linux/drivers/isdn/hardware/eicon/di.h Mon Mar 3 09:12:30 2003
@@ -36,7 +36,7 @@
#define DIVA_MISC_FLAGS_NO_RC_CANCELLING 0x02
#define DIVA_MISC_FLAGS_RX_DMA 0x04
/* structure for all information we have to keep on a per */
- /* adapater basis */
+ /* adapter basis */
typedef struct adapter_s ADAPTER;
struct adapter_s {
void * io;
diff -ur 2.5-current/drivers/isdn/i4l/isdn_ciscohdlck.c linux/drivers/isdn/i4l/isdn_ciscohdlck.c
--- 2.5-current/drivers/isdn/i4l/isdn_ciscohdlck.c Mon Mar 3 07:22:37 2003
+++ linux/drivers/isdn/i4l/isdn_ciscohdlck.c Mon Mar 3 08:50:31 2003
@@ -143,7 +143,7 @@
printk (KERN_WARNING
"UPDOWN: Line protocol on Interface %s,"
" changed state to down\n", idev->name);
- /* should stop routing higher-level data accross */
+ /* should stop routing higher-level data across */
} else if (!cisco->line_state &&
myseq_diff >= 0 && myseq_diff <= 2) {
/* line down -> up */
@@ -151,7 +151,7 @@
printk (KERN_WARNING
"UPDOWN: Line protocol on Interface %s,"
" changed state to up\n", idev->name);
- /* restart routing higher-level data accross */
+ /* restart routing higher-level data across */
}
if (cisco->debserint)
diff -ur 2.5-current/drivers/media/dvb/frontends/alps_tdmb7.c linux/drivers/media/dvb/frontends/alps_tdmb7.c
--- 2.5-current/drivers/media/dvb/frontends/alps_tdmb7.c Mon Mar 3 07:22:41 2003
+++ linux/drivers/media/dvb/frontends/alps_tdmb7.c Mon Mar 3 08:50:31 2003
@@ -381,7 +381,7 @@
cx22700_set_inversion (i2c, p->inversion);
cx22700_set_tps (i2c, &p->u.ofdm);
cx22700_writereg (i2c, 0x37, 0x01); /* PAL loop filter off */
- cx22700_writereg (i2c, 0x00, 0x01); /* restart aquire */
+ cx22700_writereg (i2c, 0x00, 0x01); /* restart acquire */
break;
}
diff -ur 2.5-current/drivers/media/video/bttvp.h linux/drivers/media/video/bttvp.h
--- 2.5-current/drivers/media/video/bttvp.h Mon Mar 3 07:22:46 2003
+++ linux/drivers/media/video/bttvp.h Mon Mar 3 08:50:30 2003
@@ -321,7 +321,7 @@
int mbox_csel;
/* risc memory management data
- - must aquire s_lock before changing these
+ - must acquire s_lock before changing these
- only the irq handler is supported to touch odd + even */
struct bttv_riscmem main;
struct bttv_buffer *top; /* current active top field */
diff -ur 2.5-current/drivers/net/sk98lin/h/skgepnmi.h linux/drivers/net/sk98lin/h/skgepnmi.h
--- 2.5-current/drivers/net/sk98lin/h/skgepnmi.h Mon Mar 3 07:22:39 2003
+++ linux/drivers/net/sk98lin/h/skgepnmi.h Mon Mar 3 09:12:31 2003
@@ -908,7 +908,7 @@
/*
- * PNMI specific adatper context structure
+ * PNMI specific adapter context structure
*/
typedef struct s_PnmiPort {
SK_U32 CounterHigh[SK_PNMI_SCNT_NOT];
diff -ur 2.5-current/drivers/net/skfp/drvfbi.c linux/drivers/net/skfp/drvfbi.c
--- 2.5-current/drivers/net/skfp/drvfbi.c Mon Mar 3 07:22:36 2003
+++ linux/drivers/net/skfp/drvfbi.c Mon Mar 3 09:12:32 2003
@@ -1421,7 +1421,7 @@
int found ;
int i ;
- found = FALSE ; /* make sure we returned with adatper not found*/
+ found = FALSE ; /* make sure we returned with adapter not found*/
/* if an empty oemids.h was included */
#ifdef MULT_OEM
diff -ur 2.5-current/drivers/net/skfp/hwmtm.c linux/drivers/net/skfp/hwmtm.c
--- 2.5-current/drivers/net/skfp/hwmtm.c Mon Mar 3 07:22:55 2003
+++ linux/drivers/net/skfp/hwmtm.c Mon Mar 3 09:12:32 2003
@@ -235,7 +235,7 @@
* In this function the hardware module allocates it's
* memory.
* The operating system dependent module should call
- * mac_drv_init once, after the adatper is detected.
+ * mac_drv_init once, after the adapter is detected.
* END_MANUAL_ENTRY
*/
int mac_drv_init(smc)
diff -ur 2.5-current/drivers/net/wan/sdla_chdlc.c linux/drivers/net/wan/sdla_chdlc.c
--- 2.5-current/drivers/net/wan/sdla_chdlc.c Mon Mar 3 07:22:54 2003
+++ linux/drivers/net/wan/sdla_chdlc.c Mon Mar 3 08:50:34 2003
@@ -3610,7 +3610,7 @@
* Rationale:
* We cannot manipulate the routing tables, or
* ip addresses withing the interrupt. Therefore
- * we must perform such actons outside an interrupt
+ * we must perform such actions outside an interrupt
* at a later time.
*
* Description:
diff -ur 2.5-current/drivers/net/wan/sdla_fr.c linux/drivers/net/wan/sdla_fr.c
--- 2.5-current/drivers/net/wan/sdla_fr.c Mon Mar 3 07:23:16 2003
+++ linux/drivers/net/wan/sdla_fr.c Mon Mar 3 08:50:34 2003
@@ -4934,7 +4934,7 @@
* Rationale:
* We cannot manipulate the routing tables, or
* ip addresses withing the interrupt. Therefore
- * we must perform such actons outside an interrupt
+ * we must perform such actions outside an interrupt
* at a later time.
*
* Description:
diff -ur 2.5-current/drivers/net/wan/sdla_ppp.c linux/drivers/net/wan/sdla_ppp.c
--- 2.5-current/drivers/net/wan/sdla_ppp.c Mon Mar 3 07:22:41 2003
+++ linux/drivers/net/wan/sdla_ppp.c Mon Mar 3 08:50:34 2003
@@ -3489,7 +3489,7 @@
* Rationale:
* We cannot manipulate the routing tables, or
* ip addresses withing the interrupt. Therefore
- * we must perform such actons outside an interrupt
+ * we must perform such actions outside an interrupt
* at a later time.
*
* Description:
diff -ur 2.5-current/drivers/scsi/sym53c8xx.c linux/drivers/scsi/sym53c8xx.c
--- 2.5-current/drivers/scsi/sym53c8xx.c Mon Mar 3 07:23:00 2003
+++ linux/drivers/scsi/sym53c8xx.c Mon Mar 3 09:21:44 2003
@@ -8738,7 +8738,7 @@
** In normal situations, interrupt conditions occur one at
** a time. But when something bad happens on the SCSI BUS,
** the chip may raise several interrupt flags before
-** stopping and interrupting the CPU. The additionnal
+** stopping and interrupting the CPU. The additional
** interrupt flags are stacked in some extra registers
** after the SIP and/or DIP flag has been raised in the
** ISTAT. After the CPU has read the interrupt condition
@@ -10635,7 +10635,7 @@
/*
** If SCRIPTS reaches its goal point, then
- ** there is no additionnal residual.
+ ** there is no additional residual.
*/
if (cp->phys.header.lastp == cp->phys.header.goalp)
return resid;
diff -ur 2.5-current/drivers/scsi/sym53c8xx_2/sym_defs.h linux/drivers/scsi/sym53c8xx_2/sym_defs.h
--- 2.5-current/drivers/scsi/sym53c8xx_2/sym_defs.h Mon Mar 3 07:22:46 2003
+++ linux/drivers/scsi/sym53c8xx_2/sym_defs.h Mon Mar 3 09:21:42 2003
@@ -736,7 +736,7 @@
*
* On 825A, 875, 895 and 896 chips the content
* of SFBR register can be used as data (SCR_SFBR_DATA).
- * The 896 has additionnal IO registers starting at
+ * The 896 has additional IO registers starting at
* offset 0x80. Bit 7 of register offset is stored in
* bit 7 of the SCRIPTS instruction first DWORD.
*
diff -ur 2.5-current/drivers/scsi/sym53c8xx_2/sym_glue.c linux/drivers/scsi/sym53c8xx_2/sym_glue.c
--- 2.5-current/drivers/scsi/sym53c8xx_2/sym_glue.c Mon Mar 3 07:23:19 2003
+++ linux/drivers/scsi/sym53c8xx_2/sym_glue.c Mon Mar 3 09:21:42 2003
@@ -2557,7 +2557,7 @@
device->chip.revision_id = revision;
/*
- * Read additionnal info from the configuration space.
+ * Read additional info from the configuration space.
*/
pci_read_config_word(pdev, PCI_COMMAND, &command);
pci_read_config_byte(pdev, PCI_CACHE_LINE_SIZE, &cache_line_size);
diff -ur 2.5-current/drivers/scsi/sym53c8xx_2/sym_hipd.c linux/drivers/scsi/sym53c8xx_2/sym_hipd.c
--- 2.5-current/drivers/scsi/sym53c8xx_2/sym_hipd.c Mon Mar 3 07:22:36 2003
+++ linux/drivers/scsi/sym53c8xx_2/sym_hipd.c Mon Mar 3 09:21:42 2003
@@ -2715,7 +2715,7 @@
* In normal situations, interrupt conditions occur one at
* a time. But when something bad happens on the SCSI BUS,
* the chip may raise several interrupt flags before
- * stopping and interrupting the CPU. The additionnal
+ * stopping and interrupting the CPU. The additional
* interrupt flags are stacked in some extra registers
* after the SIP and/or DIP flag has been raised in the
* ISTAT. After the CPU has read the interrupt condition
diff -ur 2.5-current/drivers/scsi/sym53c8xx_2/sym_misc.c linux/drivers/scsi/sym53c8xx_2/sym_misc.c
--- 2.5-current/drivers/scsi/sym53c8xx_2/sym_misc.c Mon Mar 3 07:23:06 2003
+++ linux/drivers/scsi/sym53c8xx_2/sym_misc.c Mon Mar 3 09:21:42 2003
@@ -74,7 +74,7 @@
* For example, if tick is 1 second and the max order is 8,
* any IO that is completed within less than 64 seconds will
* just be put into some list at queuing and be removed
- * at completion without any additionnal overhead.
+ * at completion without any additional overhead.
*/
/*
diff -ur 2.5-current/drivers/scsi/sym53c8xx_defs.h linux/drivers/scsi/sym53c8xx_defs.h
--- 2.5-current/drivers/scsi/sym53c8xx_defs.h Mon Mar 3 07:23:02 2003
+++ linux/drivers/scsi/sym53c8xx_defs.h Mon Mar 3 09:21:44 2003
@@ -1588,7 +1588,7 @@
**-----------------------------------------------------------
** On 810A, 860, 825A, 875, 895 and 896 chips the content
** of SFBR register can be used as data (SCR_SFBR_DATA).
-** The 896 has additionnal IO registers starting at
+** The 896 has additional IO registers starting at
** offset 0x80. Bit 7 of register offset is stored in
** bit 7 of the SCRIPTS instruction first DWORD.
**-----------------------------------------------------------
diff -ur 2.5-current/drivers/video/sis/sisfb.h linux/drivers/video/sis/sisfb.h
--- 2.5-current/drivers/video/sis/sisfb.h Mon Mar 3 07:23:00 2003
+++ linux/drivers/video/sis/sisfb.h Mon Mar 3 09:21:39 2003
@@ -117,7 +117,7 @@
};
-/* TW: Addtional IOCTL for communication sisfb <> X driver */
+/* TW: Additional IOCTL for communication sisfb <> X driver */
/* If changing this, vgatypes.h must also be changed (for X driver) */
/* TW: ioctl for identifying and giving some info (esp. memory heap start) */
diff -ur 2.5-current/drivers/video/sis/vgatypes.h linux/drivers/video/sis/vgatypes.h
--- 2.5-current/drivers/video/sis/vgatypes.h Mon Mar 3 07:22:36 2003
+++ linux/drivers/video/sis/vgatypes.h Mon Mar 3 09:21:39 2003
@@ -243,7 +243,7 @@
#endif /*~ mark by Paul ,Move definition to sisv.h */
-/* TW: Addtional IOCTL for communication sisfb <> X driver */
+/* TW: Additional IOCTL for communication sisfb <> X driver */
/* If changing this, sisfb.h must also be changed (for sisfb) */
#ifdef LINUX_XF86 /* We don't want the X driver to depend on the kernel source */
diff -ur 2.5-current/include/asm-m68knommu/mcftimer.h linux/include/asm-m68knommu/mcftimer.h
--- 2.5-current/include/asm-m68knommu/mcftimer.h Mon Mar 3 07:22:55 2003
+++ linux/include/asm-m68knommu/mcftimer.h Mon Mar 3 08:50:51 2003
@@ -55,7 +55,7 @@
/*
* Bit definitions for the Timer Mode Register (TMR).
- * Register bit flags are common accross ColdFires.
+ * Register bit flags are common across ColdFires.
*/
#define MCFTIMER_TMR_PREMASK 0xff00 /* Prescalar mask */
#define MCFTIMER_TMR_DISCE 0x0000 /* Disable capture */
diff -ur 2.5-current/include/linux/sisfb.h linux/include/linux/sisfb.h
--- 2.5-current/include/linux/sisfb.h Mon Mar 3 07:23:00 2003
+++ linux/include/linux/sisfb.h Mon Mar 3 09:21:54 2003
@@ -133,7 +133,7 @@
};
-/* TW: Addtional IOCTL for communication sisfb <> X driver */
+/* TW: Additional IOCTL for communication sisfb <> X driver */
/* If changing this, vgatypes.h must also be changed (for X driver) */
/* TW: ioctl for identifying and giving some info (esp. memory heap start) */
diff -ur 2.5-current/sound/oss/dmabuf.c linux/sound/oss/dmabuf.c
--- 2.5-current/sound/oss/dmabuf.c Mon Mar 3 07:22:37 2003
+++ linux/sound/oss/dmabuf.c Mon Mar 3 08:50:57 2003
@@ -856,7 +856,7 @@
spin_unlock_irqrestore(&dmap->lock,flags);
return 0;
}
-/* has to aquire dmap->lock */
+/* has to acquire dmap->lock */
int DMAbuf_move_wrpointer(int dev, int l)
{
struct audio_operations *adev = audio_devs[dev];
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/