aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/cris/include/arch-v10/arch/irq.h2
-rw-r--r--arch/cris/include/arch-v32/arch/irq.h2
-rw-r--r--include/linux/netdevice.h2
-rw-r--r--include/net/irda/irlmp.h2
-rw-r--r--net/netfilter/nf_log.c2
-rw-r--r--sound/core/seq/seq_device.c2
6 files changed, 6 insertions, 6 deletions
diff --git a/arch/cris/include/arch-v10/arch/irq.h b/arch/cris/include/arch-v10/arch/irq.h
index 7d345947b3ee..ca2675ae08ed 100644
--- a/arch/cris/include/arch-v10/arch/irq.h
+++ b/arch/cris/include/arch-v10/arch/irq.h
@@ -142,7 +142,7 @@ __asm__ ( \
142 * it here, we would not get the multiple_irq at all. 142 * it here, we would not get the multiple_irq at all.
143 * 143 *
144 * The non-blocking here is based on the knowledge that the timer interrupt is 144 * The non-blocking here is based on the knowledge that the timer interrupt is
145 * registred as a fast interrupt (IRQF_DISABLED) so that we _know_ there will not 145 * registered as a fast interrupt (IRQF_DISABLED) so that we _know_ there will not
146 * be an sti() before the timer irq handler is run to acknowledge the interrupt. 146 * be an sti() before the timer irq handler is run to acknowledge the interrupt.
147 */ 147 */
148 148
diff --git a/arch/cris/include/arch-v32/arch/irq.h b/arch/cris/include/arch-v32/arch/irq.h
index b31e9984f849..fe3cdd22bed4 100644
--- a/arch/cris/include/arch-v32/arch/irq.h
+++ b/arch/cris/include/arch-v32/arch/irq.h
@@ -103,7 +103,7 @@ __asm__ ( \
103 * if we had BLOCK'edit here, we would not get the multiple_irq at all. 103 * if we had BLOCK'edit here, we would not get the multiple_irq at all.
104 * 104 *
105 * The non-blocking here is based on the knowledge that the timer interrupt is 105 * The non-blocking here is based on the knowledge that the timer interrupt is
106 * registred as a fast interrupt (IRQF_DISABLED) so that we _know_ there will not 106 * registered as a fast interrupt (IRQF_DISABLED) so that we _know_ there will not
107 * be an sti() before the timer irq handler is run to acknowledge the interrupt. 107 * be an sti() before the timer irq handler is run to acknowledge the interrupt.
108 */ 108 */
109#define BUILD_TIMER_IRQ(nr, mask) \ 109#define BUILD_TIMER_IRQ(nr, mask) \
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index f8eda0276f03..b2056e6e2acc 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/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/net/netfilter/nf_log.c b/net/netfilter/nf_log.c
index 703fb26aa48d..9e312695c818 100644
--- a/net/netfilter/nf_log.c
+++ b/net/netfilter/nf_log.c
@@ -32,7 +32,7 @@ static struct nf_logger *__find_logger(int pf, const char *str_logger)
32 return NULL; 32 return NULL;
33} 33}
34 34
35/* return EEXIST if the same logger is registred, 0 on success. */ 35/* return EEXIST if the same logger is registered, 0 on success. */
36int nf_log_register(u_int8_t pf, struct nf_logger *logger) 36int nf_log_register(u_int8_t pf, struct nf_logger *logger)
37{ 37{
38 const struct nf_logger *llog; 38 const struct nf_logger *llog;
diff --git a/sound/core/seq/seq_device.c b/sound/core/seq/seq_device.c
index 60e8fc1b3440..040c60e1da28 100644
--- a/sound/core/seq/seq_device.c
+++ b/sound/core/seq/seq_device.c
@@ -66,7 +66,7 @@ struct ops_list {
66 /* operators */ 66 /* operators */
67 struct snd_seq_dev_ops ops; 67 struct snd_seq_dev_ops ops;
68 68
69 /* registred devices */ 69 /* registered devices */
70 struct list_head dev_list; /* list of devices */ 70 struct list_head dev_list; /* list of devices */
71 int num_devices; /* number of associated devices */ 71 int num_devices; /* number of associated devices */
72 int num_init_devices; /* number of initialized devices */ 72 int num_init_devices; /* number of initialized devices */