aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert P. J. Day <rpjday@mindspring.com>2007-02-17 13:07:33 -0500
committerAdrian Bunk <bunk@stusta.de>2007-02-17 13:07:33 -0500
commitd08df601a30df9e36c29f3214315f4f0c8784c68 (patch)
treecc40826467113f1bfd2e666bb51670e31f436355
parent6340aa61b1f1d9c2aadb20594778a5f849bcbb69 (diff)
Various typo fixes.
Correct mis-spellings of "algorithm", "appear", "consistent" and (shame, shame) "kernel". Signed-off-by: Robert P. J. Day <rpjday@mindspring.com> Signed-off-by: Adrian Bunk <bunk@stusta.de>
-rw-r--r--Documentation/video4linux/bttv/Insmod-options2
-rw-r--r--arch/m32r/lib/usercopy.c4
-rw-r--r--arch/m68knommu/platform/5307/timers.c2
-rw-r--r--drivers/infiniband/hw/ipath/ipath_iba6110.c2
-rw-r--r--drivers/infiniband/hw/ipath/ipath_iba6120.c2
-rw-r--r--drivers/isdn/i4l/isdn_ppp.c2
-rw-r--r--drivers/net/e1000/e1000_hw.h2
-rw-r--r--drivers/net/wireless/wavelan_cs.c8
-rw-r--r--drivers/sbus/char/vfc_i2c.c2
-rw-r--r--include/linux/seqlock.h2
-rw-r--r--lib/textsearch.c2
-rw-r--r--net/ipv4/tcp_cong.c2
12 files changed, 16 insertions, 16 deletions
diff --git a/Documentation/video4linux/bttv/Insmod-options b/Documentation/video4linux/bttv/Insmod-options
index bb7c2cac7917..5ef75787f83a 100644
--- a/Documentation/video4linux/bttv/Insmod-options
+++ b/Documentation/video4linux/bttv/Insmod-options
@@ -57,7 +57,7 @@ bttv.o
57 i2c_udelay= Allow reduce I2C speed. Default is 5 usecs 57 i2c_udelay= Allow reduce I2C speed. Default is 5 usecs
58 (meaning 66,67 Kbps). The default is the 58 (meaning 66,67 Kbps). The default is the
59 maximum supported speed by kernel bitbang 59 maximum supported speed by kernel bitbang
60 algoritm. You may use lower numbers, if I2C 60 algorithm. You may use lower numbers, if I2C
61 messages are lost (16 is known to work on 61 messages are lost (16 is known to work on
62 all supported cards). 62 all supported cards).
63 63
diff --git a/arch/m32r/lib/usercopy.c b/arch/m32r/lib/usercopy.c
index 896cef1aca5f..82abd159dbef 100644
--- a/arch/m32r/lib/usercopy.c
+++ b/arch/m32r/lib/usercopy.c
@@ -293,7 +293,7 @@ long strnlen_user(const char __user *s, long n)
293 : "0" (n), "1" (s), "r" (n & 3), "r" (mask), "r"(0x01010101) 293 : "0" (n), "1" (s), "r" (n & 3), "r" (mask), "r"(0x01010101)
294 : "r0", "r1", "cbit"); 294 : "r0", "r1", "cbit");
295 295
296 /* NOTE: strnlen_user() algorism: 296 /* NOTE: strnlen_user() algorithm:
297 * { 297 * {
298 * char *p; 298 * char *p;
299 * for (p = s; n-- && *p != '\0'; ++p) 299 * for (p = s; n-- && *p != '\0'; ++p)
@@ -369,7 +369,7 @@ long strnlen_user(const char __user *s, long n)
369 : "0" (n), "1" (s), "r" (n & 3), "r" (mask), "r"(0x01010101) 369 : "0" (n), "1" (s), "r" (n & 3), "r" (mask), "r"(0x01010101)
370 : "r0", "r1", "r2", "r3", "cbit"); 370 : "r0", "r1", "r2", "r3", "cbit");
371 371
372 /* NOTE: strnlen_user() algorism: 372 /* NOTE: strnlen_user() algorithm:
373 * { 373 * {
374 * char *p; 374 * char *p;
375 * for (p = s; n-- && *p != '\0'; ++p) 375 * for (p = s; n-- && *p != '\0'; ++p)
diff --git a/arch/m68knommu/platform/5307/timers.c b/arch/m68knommu/platform/5307/timers.c
index 87b112b363a6..92e58070b016 100644
--- a/arch/m68knommu/platform/5307/timers.c
+++ b/arch/m68knommu/platform/5307/timers.c
@@ -104,7 +104,7 @@ unsigned long coldfire_timer_offset(void)
104 104
105/* 105/*
106 * Choose a reasonably fast profile timer. Make it an odd value to 106 * Choose a reasonably fast profile timer. Make it an odd value to
107 * try and get good coverage of kernal operations. 107 * try and get good coverage of kernel operations.
108 */ 108 */
109#define PROFILEHZ 1013 109#define PROFILEHZ 1013
110 110
diff --git a/drivers/infiniband/hw/ipath/ipath_iba6110.c b/drivers/infiniband/hw/ipath/ipath_iba6110.c
index 7468477ba837..993482545021 100644
--- a/drivers/infiniband/hw/ipath/ipath_iba6110.c
+++ b/drivers/infiniband/hw/ipath/ipath_iba6110.c
@@ -1534,7 +1534,7 @@ static int ipath_ht_early_init(struct ipath_devdata *dd)
1534 * @kbase: ipath_base_info pointer 1534 * @kbase: ipath_base_info pointer
1535 * 1535 *
1536 * We set the PCIE flag because the lower bandwidth on PCIe vs 1536 * We set the PCIE flag because the lower bandwidth on PCIe vs
1537 * HyperTransport can affect some user packet algorithims. 1537 * HyperTransport can affect some user packet algorithms.
1538 */ 1538 */
1539static int ipath_ht_get_base_info(struct ipath_portdata *pd, void *kbase) 1539static int ipath_ht_get_base_info(struct ipath_portdata *pd, void *kbase)
1540{ 1540{
diff --git a/drivers/infiniband/hw/ipath/ipath_iba6120.c b/drivers/infiniband/hw/ipath/ipath_iba6120.c
index ae8bf9950c6d..05918e1e7c36 100644
--- a/drivers/infiniband/hw/ipath/ipath_iba6120.c
+++ b/drivers/infiniband/hw/ipath/ipath_iba6120.c
@@ -1293,7 +1293,7 @@ int __attribute__((weak)) ipath_unordered_wc(void)
1293 * @kbase: ipath_base_info pointer 1293 * @kbase: ipath_base_info pointer
1294 * 1294 *
1295 * We set the PCIE flag because the lower bandwidth on PCIe vs 1295 * We set the PCIE flag because the lower bandwidth on PCIe vs
1296 * HyperTransport can affect some user packet algorithims. 1296 * HyperTransport can affect some user packet algorithms.
1297 */ 1297 */
1298static int ipath_pe_get_base_info(struct ipath_portdata *pd, void *kbase) 1298static int ipath_pe_get_base_info(struct ipath_portdata *pd, void *kbase)
1299{ 1299{
diff --git a/drivers/isdn/i4l/isdn_ppp.c b/drivers/isdn/i4l/isdn_ppp.c
index 4e3f127e4003..1b2df80c3bce 100644
--- a/drivers/isdn/i4l/isdn_ppp.c
+++ b/drivers/isdn/i4l/isdn_ppp.c
@@ -1680,7 +1680,7 @@ static void isdn_ppp_mp_receive(isdn_net_dev * net_dev, isdn_net_local * lp,
1680 * - we hit a gap in the sequence, so no reassembly/processing is 1680 * - we hit a gap in the sequence, so no reassembly/processing is
1681 * possible ('start' would be set to NULL) 1681 * possible ('start' would be set to NULL)
1682 * 1682 *
1683 * algorightm for this code is derived from code in the book 1683 * algorithm for this code is derived from code in the book
1684 * 'PPP Design And Debugging' by James Carlson (Addison-Wesley) 1684 * 'PPP Design And Debugging' by James Carlson (Addison-Wesley)
1685 */ 1685 */
1686 while (start != NULL || newfrag != NULL) { 1686 while (start != NULL || newfrag != NULL) {
diff --git a/drivers/net/e1000/e1000_hw.h b/drivers/net/e1000/e1000_hw.h
index d67105883341..bd000b802ee7 100644
--- a/drivers/net/e1000/e1000_hw.h
+++ b/drivers/net/e1000/e1000_hw.h
@@ -3253,7 +3253,7 @@ struct e1000_host_command_info {
3253#define IFE_PMC_AUTO_MDIX 0x0080 /* 1=enable MDI/MDI-X feature, default 0=disabled */ 3253#define IFE_PMC_AUTO_MDIX 0x0080 /* 1=enable MDI/MDI-X feature, default 0=disabled */
3254#define IFE_PMC_FORCE_MDIX 0x0040 /* 1=force MDIX-X, 0=force MDI */ 3254#define IFE_PMC_FORCE_MDIX 0x0040 /* 1=force MDIX-X, 0=force MDI */
3255#define IFE_PMC_MDIX_STATUS 0x0020 /* 1=MDI-X, 0=MDI */ 3255#define IFE_PMC_MDIX_STATUS 0x0020 /* 1=MDI-X, 0=MDI */
3256#define IFE_PMC_AUTO_MDIX_COMPLETE 0x0010 /* Resolution algorthm is completed */ 3256#define IFE_PMC_AUTO_MDIX_COMPLETE 0x0010 /* Resolution algorithm is completed */
3257#define IFE_PMC_MDIX_MODE_SHIFT 6 3257#define IFE_PMC_MDIX_MODE_SHIFT 6
3258#define IFE_PHC_MDIX_RESET_ALL_MASK 0x0000 /* Disable auto MDI-X */ 3258#define IFE_PHC_MDIX_RESET_ALL_MASK 0x0000 /* Disable auto MDI-X */
3259 3259
diff --git a/drivers/net/wireless/wavelan_cs.c b/drivers/net/wireless/wavelan_cs.c
index 5eb81638e846..b04239792f63 100644
--- a/drivers/net/wireless/wavelan_cs.c
+++ b/drivers/net/wireless/wavelan_cs.c
@@ -1168,7 +1168,7 @@ wv_mmc_show(struct net_device * dev)
1168 m.mmr_unused0[6], 1168 m.mmr_unused0[6],
1169 m.mmr_unused0[7]); 1169 m.mmr_unused0[7]);
1170#endif /* DEBUG_SHOW_UNUSED */ 1170#endif /* DEBUG_SHOW_UNUSED */
1171 printk(KERN_DEBUG "Encryption algorythm: %02X - Status: %02X\n", 1171 printk(KERN_DEBUG "Encryption algorithm: %02X - Status: %02X\n",
1172 m.mmr_des_avail, m.mmr_des_status); 1172 m.mmr_des_avail, m.mmr_des_status);
1173#ifdef DEBUG_SHOW_UNUSED 1173#ifdef DEBUG_SHOW_UNUSED
1174 printk(KERN_DEBUG "mmc_unused1[]: %02X:%02X:%02X:%02X:%02X\n", 1174 printk(KERN_DEBUG "mmc_unused1[]: %02X:%02X:%02X:%02X:%02X\n",
@@ -3590,9 +3590,9 @@ wv_82593_config(struct net_device * dev)
3590 cfblk.acloc = TRUE; /* Disable source addr insertion by i82593 */ 3590 cfblk.acloc = TRUE; /* Disable source addr insertion by i82593 */
3591 cfblk.preamb_len = 0; /* 2 bytes preamble (SFD) */ 3591 cfblk.preamb_len = 0; /* 2 bytes preamble (SFD) */
3592 cfblk.loopback = FALSE; 3592 cfblk.loopback = FALSE;
3593 cfblk.lin_prio = 0; /* conform to 802.3 backoff algoritm */ 3593 cfblk.lin_prio = 0; /* conform to 802.3 backoff algorithm */
3594 cfblk.exp_prio = 5; /* conform to 802.3 backoff algoritm */ 3594 cfblk.exp_prio = 5; /* conform to 802.3 backoff algorithm */
3595 cfblk.bof_met = 1; /* conform to 802.3 backoff algoritm */ 3595 cfblk.bof_met = 1; /* conform to 802.3 backoff algorithm */
3596 cfblk.ifrm_spc = 0x20 >> 4; /* 32 bit times interframe spacing */ 3596 cfblk.ifrm_spc = 0x20 >> 4; /* 32 bit times interframe spacing */
3597 cfblk.slottim_low = 0x20 >> 5; /* 32 bit times slot time */ 3597 cfblk.slottim_low = 0x20 >> 5; /* 32 bit times slot time */
3598 cfblk.slottim_hi = 0x0; 3598 cfblk.slottim_hi = 0x0;
diff --git a/drivers/sbus/char/vfc_i2c.c b/drivers/sbus/char/vfc_i2c.c
index ceec30648f4f..9efed771f6c0 100644
--- a/drivers/sbus/char/vfc_i2c.c
+++ b/drivers/sbus/char/vfc_i2c.c
@@ -14,7 +14,7 @@
14/* NOTE: It seems to me that the documentation regarding the 14/* NOTE: It seems to me that the documentation regarding the
15pcd8584t/pcf8584 does not show the correct way to address the i2c bus. 15pcd8584t/pcf8584 does not show the correct way to address the i2c bus.
16Based on the information on the I2C bus itself and the remainder of 16Based on the information on the I2C bus itself and the remainder of
17the Phillips docs the following algorithims apper to be correct. I am 17the Phillips docs the following algorithms appear to be correct. I am
18fairly certain that the flowcharts in the phillips docs are wrong. */ 18fairly certain that the flowcharts in the phillips docs are wrong. */
19 19
20 20
diff --git a/include/linux/seqlock.h b/include/linux/seqlock.h
index 6b0648cfdffc..52c9eb9b6df2 100644
--- a/include/linux/seqlock.h
+++ b/include/linux/seqlock.h
@@ -2,7 +2,7 @@
2#define __LINUX_SEQLOCK_H 2#define __LINUX_SEQLOCK_H
3/* 3/*
4 * Reader/writer consistent mechanism without starving writers. This type of 4 * Reader/writer consistent mechanism without starving writers. This type of
5 * lock for data where the reader wants a consitent set of information 5 * lock for data where the reader wants a consistent set of information
6 * and is willing to retry if the information changes. Readers never 6 * and is willing to retry if the information changes. Readers never
7 * block but they may have to retry if a writer is in 7 * block but they may have to retry if a writer is in
8 * progress. Writers do not wait for readers. 8 * progress. Writers do not wait for readers.
diff --git a/lib/textsearch.c b/lib/textsearch.c
index 9e2a002c5b54..88c98a2ec8d9 100644
--- a/lib/textsearch.c
+++ b/lib/textsearch.c
@@ -40,7 +40,7 @@
40 * configuration according to the specified parameters. 40 * configuration according to the specified parameters.
41 * (3) User starts the search(es) by calling _find() or _next() to 41 * (3) User starts the search(es) by calling _find() or _next() to
42 * fetch subsequent occurrences. A state variable is provided 42 * fetch subsequent occurrences. A state variable is provided
43 * to the algorihtm to store persistent variables. 43 * to the algorithm to store persistent variables.
44 * (4) Core eventually resets the search offset and forwards the find() 44 * (4) Core eventually resets the search offset and forwards the find()
45 * request to the algorithm. 45 * request to the algorithm.
46 * (5) Algorithm calls get_next_block() provided by the user continously 46 * (5) Algorithm calls get_next_block() provided by the user continously
diff --git a/net/ipv4/tcp_cong.c b/net/ipv4/tcp_cong.c
index c1b34f1edb32..5c8caf4a1244 100644
--- a/net/ipv4/tcp_cong.c
+++ b/net/ipv4/tcp_cong.c
@@ -29,7 +29,7 @@ static struct tcp_congestion_ops *tcp_ca_find(const char *name)
29} 29}
30 30
31/* 31/*
32 * Attach new congestion control algorthim to the list 32 * Attach new congestion control algorithm to the list
33 * of available options. 33 * of available options.
34 */ 34 */
35int tcp_register_congestion_control(struct tcp_congestion_ops *ca) 35int tcp_register_congestion_control(struct tcp_congestion_ops *ca)