aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-12-13 15:00:02 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2012-12-13 15:00:02 -0500
commita2013a13e68354e0c8f3696b69701803e13fb737 (patch)
treea7e1da6bfad1aa2afd83f401874d606269ce90b4 /include
parentdadfab4873256d2145640c0ce468fcbfb48977fe (diff)
parent106f9d9337f65bd428c0c79f650e3489e458d771 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial branch from Jiri Kosina: "Usual stuff -- comment/printk typo fixes, documentation updates, dead code elimination." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits) HOWTO: fix double words typo x86 mtrr: fix comment typo in mtrr_bp_init propagate name change to comments in kernel source doc: Update the name of profiling based on sysfs treewide: Fix typos in various drivers treewide: Fix typos in various Kconfig wireless: mwifiex: Fix typo in wireless/mwifiex driver messages: i2o: Fix typo in messages/i2o scripts/kernel-doc: check that non-void fcts describe their return value Kernel-doc: Convention: Use a "Return" section to describe return values radeon: Fix typo and copy/paste error in comments doc: Remove unnecessary declarations from Documentation/accounting/getdelays.c various: Fix spelling of "asynchronous" in comments. Fix misspellings of "whether" in comments. eisa: Fix spelling of "asynchronous". various: Fix spelling of "registered" in comments. doc: fix quite a few typos within Documentation target: iscsi: fix comment typos in target/iscsi drivers treewide: fix typo of "suport" in various comments and Kconfig treewide: fix typo of "suppport" in various comments ...
Diffstat (limited to 'include')
-rw-r--r--include/linux/dlm.h2
-rw-r--r--include/linux/hash.h2
-rw-r--r--include/linux/ipmi_smi.h2
-rw-r--r--include/linux/lru_cache.h4
-rw-r--r--include/linux/netdevice.h2
-rw-r--r--include/linux/stmmac.h2
-rw-r--r--include/linux/vgaarb.h4
-rw-r--r--include/linux/watchdog.h2
-rw-r--r--include/net/irda/irlmp.h2
-rw-r--r--include/net/sock.h2
10 files changed, 12 insertions, 12 deletions
diff --git a/include/linux/dlm.h b/include/linux/dlm.h
index 1d47dcce11e1..d02da2c6fc1a 100644
--- a/include/linux/dlm.h
+++ b/include/linux/dlm.h
@@ -98,7 +98,7 @@ int dlm_release_lockspace(dlm_lockspace_t *lockspace, int force);
98/* 98/*
99 * dlm_lock 99 * dlm_lock
100 * 100 *
101 * Make an asyncronous request to acquire or convert a lock on a named 101 * Make an asynchronous request to acquire or convert a lock on a named
102 * resource. 102 * resource.
103 * 103 *
104 * lockspace: context for the request 104 * lockspace: context for the request
diff --git a/include/linux/hash.h b/include/linux/hash.h
index 24df9e70406f..61c97ae22e01 100644
--- a/include/linux/hash.h
+++ b/include/linux/hash.h
@@ -1,7 +1,7 @@
1#ifndef _LINUX_HASH_H 1#ifndef _LINUX_HASH_H
2#define _LINUX_HASH_H 2#define _LINUX_HASH_H
3/* Fast hashing routine for ints, longs and pointers. 3/* Fast hashing routine for ints, longs and pointers.
4 (C) 2002 William Lee Irwin III, IBM */ 4 (C) 2002 Nadia Yvette Chambers, IBM */
5 5
6/* 6/*
7 * Knuth recommends primes in approximately golden ratio to the maximum 7 * Knuth recommends primes in approximately golden ratio to the maximum
diff --git a/include/linux/ipmi_smi.h b/include/linux/ipmi_smi.h
index fcb5d44ea635..8ea3fe0b9759 100644
--- a/include/linux/ipmi_smi.h
+++ b/include/linux/ipmi_smi.h
@@ -216,7 +216,7 @@ int ipmi_unregister_smi(ipmi_smi_t intf);
216 216
217/* 217/*
218 * The lower layer reports received messages through this interface. 218 * The lower layer reports received messages through this interface.
219 * The data_size should be zero if this is an asyncronous message. If 219 * The data_size should be zero if this is an asynchronous message. If
220 * the lower layer gets an error sending a message, it should format 220 * the lower layer gets an error sending a message, it should format
221 * an error response in the message response. 221 * an error response in the message response.
222 */ 222 */
diff --git a/include/linux/lru_cache.h b/include/linux/lru_cache.h
index 7a71ffad037c..cafc7f99e124 100644
--- a/include/linux/lru_cache.h
+++ b/include/linux/lru_cache.h
@@ -52,8 +52,8 @@ We replicate IO (more or less synchronously) to local and remote disk.
52 52
53For crash recovery after replication node failure, 53For crash recovery after replication node failure,
54 we need to resync all regions that have been target of in-flight WRITE IO 54 we need to resync all regions that have been target of in-flight WRITE IO
55 (in use, or "hot", regions), as we don't know wether or not those WRITEs have 55 (in use, or "hot", regions), as we don't know whether or not those WRITEs
56 made it to stable storage. 56 have made it to stable storage.
57 57
58 To avoid a "full resync", we need to persistently track these regions. 58 To avoid a "full resync", we need to persistently track these regions.
59 59
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index ef9336c9d464..02e0f6b156c3 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -369,7 +369,7 @@ typedef enum gro_result gro_result_t;
369 * 369 *
370 * If the rx_handler consider the skb should be ignored, it should return 370 * If the rx_handler consider the skb should be ignored, it should return
371 * RX_HANDLER_EXACT. The skb will only be delivered to protocol handlers that 371 * RX_HANDLER_EXACT. The skb will only be delivered to protocol handlers that
372 * are registred on exact device (ptype->dev == skb->dev). 372 * are registered on exact device (ptype->dev == skb->dev).
373 * 373 *
374 * If the rx_handler didn't changed skb->dev, but want the skb to be normally 374 * If the rx_handler didn't changed skb->dev, but want the skb to be normally
375 * delivered, it should return RX_HANDLER_PASS. 375 * delivered, it should return RX_HANDLER_PASS.
diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h
index de5b2f8176ce..c1b3ed3fb787 100644
--- a/include/linux/stmmac.h
+++ b/include/linux/stmmac.h
@@ -61,7 +61,7 @@
61#define STMMAC_CSR_I_16 0xE /* clk_csr_i/16 */ 61#define STMMAC_CSR_I_16 0xE /* clk_csr_i/16 */
62#define STMMAC_CSR_I_18 0xF /* clk_csr_i/18 */ 62#define STMMAC_CSR_I_18 0xF /* clk_csr_i/18 */
63 63
64/* AXI DMA Burst length suported */ 64/* AXI DMA Burst length supported */
65#define DMA_AXI_BLEN_4 (1 << 1) 65#define DMA_AXI_BLEN_4 (1 << 1)
66#define DMA_AXI_BLEN_8 (1 << 2) 66#define DMA_AXI_BLEN_8 (1 << 2)
67#define DMA_AXI_BLEN_16 (1 << 3) 67#define DMA_AXI_BLEN_16 (1 << 3)
diff --git a/include/linux/vgaarb.h b/include/linux/vgaarb.h
index 0ee42d9acdc0..2c02f3a8d2ba 100644
--- a/include/linux/vgaarb.h
+++ b/include/linux/vgaarb.h
@@ -78,7 +78,7 @@ extern void vga_set_legacy_decoding(struct pci_dev *pdev,
78 * This function acquires VGA resources for the given 78 * This function acquires VGA resources for the given
79 * card and mark those resources locked. If the resource requested 79 * card and mark those resources locked. If the resource requested
80 * are "normal" (and not legacy) resources, the arbiter will first check 80 * are "normal" (and not legacy) resources, the arbiter will first check
81 * wether the card is doing legacy decoding for that type of resource. If 81 * whether the card is doing legacy decoding for that type of resource. If
82 * yes, the lock is "converted" into a legacy resource lock. 82 * yes, the lock is "converted" into a legacy resource lock.
83 * The arbiter will first look for all VGA cards that might conflict 83 * The arbiter will first look for all VGA cards that might conflict
84 * and disable their IOs and/or Memory access, including VGA forwarding 84 * and disable their IOs and/or Memory access, including VGA forwarding
@@ -89,7 +89,7 @@ extern void vga_set_legacy_decoding(struct pci_dev *pdev,
89 * This function will block if some conflicting card is already locking 89 * This function will block if some conflicting card is already locking
90 * one of the required resources (or any resource on a different bus 90 * one of the required resources (or any resource on a different bus
91 * segment, since P2P bridges don't differenciate VGA memory and IO 91 * segment, since P2P bridges don't differenciate VGA memory and IO
92 * afaik). You can indicate wether this blocking should be interruptible 92 * afaik). You can indicate whether this blocking should be interruptible
93 * by a signal (for userland interface) or not. 93 * by a signal (for userland interface) or not.
94 * Must not be called at interrupt time or in atomic context. 94 * Must not be called at interrupt time or in atomic context.
95 * If the card already owns the resources, the function succeeds. 95 * If the card already owns the resources, the function succeeds.
diff --git a/include/linux/watchdog.h b/include/linux/watchdog.h
index b7f45d48b2de..87490ac4bd87 100644
--- a/include/linux/watchdog.h
+++ b/include/linux/watchdog.h
@@ -105,7 +105,7 @@ struct watchdog_device {
105#define WATCHDOG_NOWAYOUT_INIT_STATUS 0 105#define WATCHDOG_NOWAYOUT_INIT_STATUS 0
106#endif 106#endif
107 107
108/* Use the following function to check wether or not the watchdog is active */ 108/* Use the following function to check whether or not the watchdog is active */
109static inline bool watchdog_active(struct watchdog_device *wdd) 109static inline bool watchdog_active(struct watchdog_device *wdd)
110{ 110{
111 return test_bit(WDOG_ACTIVE, &wdd->status); 111 return test_bit(WDOG_ACTIVE, &wdd->status);
diff --git a/include/net/irda/irlmp.h b/include/net/irda/irlmp.h
index fff11b7fe8a4..591f78631f13 100644
--- a/include/net/irda/irlmp.h
+++ b/include/net/irda/irlmp.h
@@ -134,7 +134,7 @@ typedef struct {
134} CACHE_ENTRY; 134} CACHE_ENTRY;
135 135
136/* 136/*
137 * Information about each registred IrLAP layer 137 * Information about each registered IrLAP layer
138 */ 138 */
139struct lap_cb { 139struct lap_cb {
140 irda_queue_t queue; /* Must be first */ 140 irda_queue_t queue; /* Must be first */
diff --git a/include/net/sock.h b/include/net/sock.h
index 0a9a01a5b0d7..93a6745bfdb2 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -231,7 +231,7 @@ struct cg_proto;
231 * @sk_sndbuf: size of send buffer in bytes 231 * @sk_sndbuf: size of send buffer in bytes
232 * @sk_flags: %SO_LINGER (l_onoff), %SO_BROADCAST, %SO_KEEPALIVE, 232 * @sk_flags: %SO_LINGER (l_onoff), %SO_BROADCAST, %SO_KEEPALIVE,
233 * %SO_OOBINLINE settings, %SO_TIMESTAMPING settings 233 * %SO_OOBINLINE settings, %SO_TIMESTAMPING settings
234 * @sk_no_check: %SO_NO_CHECK setting, wether or not checkup packets 234 * @sk_no_check: %SO_NO_CHECK setting, whether or not checkup packets
235 * @sk_route_caps: route capabilities (e.g. %NETIF_F_TSO) 235 * @sk_route_caps: route capabilities (e.g. %NETIF_F_TSO)
236 * @sk_route_nocaps: forbidden route capabilities (e.g NETIF_F_GSO_MASK) 236 * @sk_route_nocaps: forbidden route capabilities (e.g NETIF_F_GSO_MASK)
237 * @sk_gso_type: GSO type (e.g. %SKB_GSO_TCPV4) 237 * @sk_gso_type: GSO type (e.g. %SKB_GSO_TCPV4)