diff options
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/chio.h | 2 | ||||
-rw-r--r-- | include/linux/cyclades.h | 2 | ||||
-rw-r--r-- | include/linux/dmaengine.h | 2 | ||||
-rw-r--r-- | include/linux/ethtool.h | 2 | ||||
-rw-r--r-- | include/linux/fs.h | 2 | ||||
-rw-r--r-- | include/linux/llc.h | 4 | ||||
-rw-r--r-- | include/linux/pm.h | 2 | ||||
-rw-r--r-- | include/linux/pnp.h | 2 | ||||
-rw-r--r-- | include/linux/sm501-regs.h | 2 | ||||
-rw-r--r-- | include/linux/spinlock_api_up.h | 2 |
10 files changed, 11 insertions, 11 deletions
diff --git a/include/linux/chio.h b/include/linux/chio.h index a404c111c937..519248d8b2b6 100644 --- a/include/linux/chio.h +++ b/include/linux/chio.h | |||
@@ -108,7 +108,7 @@ struct changer_element_status { | |||
108 | 108 | ||
109 | /* | 109 | /* |
110 | * CHIOGELEM | 110 | * CHIOGELEM |
111 | * get more detailed status informtion for a single element | 111 | * get more detailed status information for a single element |
112 | */ | 112 | */ |
113 | struct changer_get_element { | 113 | struct changer_get_element { |
114 | int cge_type; /* type/unit */ | 114 | int cge_type; /* type/unit */ |
diff --git a/include/linux/cyclades.h b/include/linux/cyclades.h index 8f3dcd30828f..504cb2c3fa9a 100644 --- a/include/linux/cyclades.h +++ b/include/linux/cyclades.h | |||
@@ -177,7 +177,7 @@ struct CUSTOM_REG { | |||
177 | __u32 fpga_version; /* FPGA Version Number Register */ | 177 | __u32 fpga_version; /* FPGA Version Number Register */ |
178 | __u32 cpu_start; /* CPU start Register (write) */ | 178 | __u32 cpu_start; /* CPU start Register (write) */ |
179 | __u32 cpu_stop; /* CPU stop Register (write) */ | 179 | __u32 cpu_stop; /* CPU stop Register (write) */ |
180 | __u32 misc_reg; /* Miscelaneous Register */ | 180 | __u32 misc_reg; /* Miscellaneous Register */ |
181 | __u32 idt_mode; /* IDT mode Register */ | 181 | __u32 idt_mode; /* IDT mode Register */ |
182 | __u32 uart_irq_status; /* UART IRQ status Register */ | 182 | __u32 uart_irq_status; /* UART IRQ status Register */ |
183 | __u32 clear_timer0_irq; /* Clear timer interrupt Register */ | 183 | __u32 clear_timer0_irq; /* Clear timer interrupt Register */ |
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h index 55c9a6952f44..5c84bf897593 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h | |||
@@ -29,7 +29,7 @@ | |||
29 | #include <linux/dma-mapping.h> | 29 | #include <linux/dma-mapping.h> |
30 | 30 | ||
31 | /** | 31 | /** |
32 | * enum dma_state - resource PNP/power managment state | 32 | * enum dma_state - resource PNP/power management state |
33 | * @DMA_RESOURCE_SUSPEND: DMA device going into low power state | 33 | * @DMA_RESOURCE_SUSPEND: DMA device going into low power state |
34 | * @DMA_RESOURCE_RESUME: DMA device returning to full power | 34 | * @DMA_RESOURCE_RESUME: DMA device returning to full power |
35 | * @DMA_RESOURCE_AVAILABLE: DMA device available to the system | 35 | * @DMA_RESOURCE_AVAILABLE: DMA device available to the system |
diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h index 71d4ada6f315..fcbe8b640ffb 100644 --- a/include/linux/ethtool.h +++ b/include/linux/ethtool.h | |||
@@ -309,7 +309,7 @@ int ethtool_op_set_flags(struct net_device *dev, u32 data); | |||
309 | * get_ringparam: Report ring sizes | 309 | * get_ringparam: Report ring sizes |
310 | * set_ringparam: Set ring sizes | 310 | * set_ringparam: Set ring sizes |
311 | * get_pauseparam: Report pause parameters | 311 | * get_pauseparam: Report pause parameters |
312 | * set_pauseparam: Set pause paramters | 312 | * set_pauseparam: Set pause parameters |
313 | * get_rx_csum: Report whether receive checksums are turned on or off | 313 | * get_rx_csum: Report whether receive checksums are turned on or off |
314 | * set_rx_csum: Turn receive checksum on or off | 314 | * set_rx_csum: Turn receive checksum on or off |
315 | * get_tx_csum: Report whether transmit checksums are turned on or off | 315 | * get_tx_csum: Report whether transmit checksums are turned on or off |
diff --git a/include/linux/fs.h b/include/linux/fs.h index a516b6716870..bcae3acab288 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
@@ -1307,7 +1307,7 @@ struct super_operations { | |||
1307 | * being set. find_inode() uses this to prevent returning | 1307 | * being set. find_inode() uses this to prevent returning |
1308 | * nearly-dead inodes. | 1308 | * nearly-dead inodes. |
1309 | * I_SYNC Similar to I_LOCK, but limited in scope to writeback | 1309 | * I_SYNC Similar to I_LOCK, but limited in scope to writeback |
1310 | * of inode dirty data. Having a seperate lock for this | 1310 | * of inode dirty data. Having a separate lock for this |
1311 | * purpose reduces latency and prevents some filesystem- | 1311 | * purpose reduces latency and prevents some filesystem- |
1312 | * specific deadlocks. | 1312 | * specific deadlocks. |
1313 | * | 1313 | * |
diff --git a/include/linux/llc.h b/include/linux/llc.h index 09f2e6d0e9eb..7733585603f1 100644 --- a/include/linux/llc.h +++ b/include/linux/llc.h | |||
@@ -49,9 +49,9 @@ enum llc_sockopts { | |||
49 | 49 | ||
50 | /* LLC SAP types. */ | 50 | /* LLC SAP types. */ |
51 | #define LLC_SAP_NULL 0x00 /* NULL SAP. */ | 51 | #define LLC_SAP_NULL 0x00 /* NULL SAP. */ |
52 | #define LLC_SAP_LLC 0x02 /* LLC Sublayer Managment. */ | 52 | #define LLC_SAP_LLC 0x02 /* LLC Sublayer Management. */ |
53 | #define LLC_SAP_SNA 0x04 /* SNA Path Control. */ | 53 | #define LLC_SAP_SNA 0x04 /* SNA Path Control. */ |
54 | #define LLC_SAP_PNM 0x0E /* Proway Network Managment. */ | 54 | #define LLC_SAP_PNM 0x0E /* Proway Network Management. */ |
55 | #define LLC_SAP_IP 0x06 /* TCP/IP. */ | 55 | #define LLC_SAP_IP 0x06 /* TCP/IP. */ |
56 | #define LLC_SAP_BSPAN 0x42 /* Bridge Spanning Tree Proto */ | 56 | #define LLC_SAP_BSPAN 0x42 /* Bridge Spanning Tree Proto */ |
57 | #define LLC_SAP_MMS 0x4E /* Manufacturing Message Srv. */ | 57 | #define LLC_SAP_MMS 0x4E /* Manufacturing Message Srv. */ |
diff --git a/include/linux/pm.h b/include/linux/pm.h index b78e0295adf4..eccf59ea2a77 100644 --- a/include/linux/pm.h +++ b/include/linux/pm.h | |||
@@ -95,7 +95,7 @@ struct pm_dev | |||
95 | }; | 95 | }; |
96 | 96 | ||
97 | /* Functions above this comment are list-based old-style power | 97 | /* Functions above this comment are list-based old-style power |
98 | * managment. Please avoid using them. */ | 98 | * management. Please avoid using them. */ |
99 | 99 | ||
100 | /* | 100 | /* |
101 | * Callbacks for platform drivers to implement. | 101 | * Callbacks for platform drivers to implement. |
diff --git a/include/linux/pnp.h b/include/linux/pnp.h index 2a6d62c7d2d1..b9339d8b95bc 100644 --- a/include/linux/pnp.h +++ b/include/linux/pnp.h | |||
@@ -126,7 +126,7 @@ struct pnp_resource_table { | |||
126 | }; | 126 | }; |
127 | 127 | ||
128 | /* | 128 | /* |
129 | * Device Managemnt | 129 | * Device Management |
130 | */ | 130 | */ |
131 | 131 | ||
132 | struct pnp_card { | 132 | struct pnp_card { |
diff --git a/include/linux/sm501-regs.h b/include/linux/sm501-regs.h index df7620dd8f31..64236b73c724 100644 --- a/include/linux/sm501-regs.h +++ b/include/linux/sm501-regs.h | |||
@@ -171,7 +171,7 @@ | |||
171 | /* USB slave/gadget data port base */ | 171 | /* USB slave/gadget data port base */ |
172 | #define SM501_USB_GADGET_DATA (0x070000) | 172 | #define SM501_USB_GADGET_DATA (0x070000) |
173 | 173 | ||
174 | /* Display contoller/video engine base */ | 174 | /* Display controller/video engine base */ |
175 | #define SM501_DC (0x080000) | 175 | #define SM501_DC (0x080000) |
176 | 176 | ||
177 | /* common defines for the SM501 address registers */ | 177 | /* common defines for the SM501 address registers */ |
diff --git a/include/linux/spinlock_api_up.h b/include/linux/spinlock_api_up.h index 67faa044c5f5..04e1d3164576 100644 --- a/include/linux/spinlock_api_up.h +++ b/include/linux/spinlock_api_up.h | |||
@@ -21,7 +21,7 @@ | |||
21 | /* | 21 | /* |
22 | * In the UP-nondebug case there's no real locking going on, so the | 22 | * In the UP-nondebug case there's no real locking going on, so the |
23 | * only thing we have to do is to keep the preempt counts and irq | 23 | * only thing we have to do is to keep the preempt counts and irq |
24 | * flags straight, to supress compiler warnings of unused lock | 24 | * flags straight, to suppress compiler warnings of unused lock |
25 | * variables, and to add the proper checker annotations: | 25 | * variables, and to add the proper checker annotations: |
26 | */ | 26 | */ |
27 | #define __LOCK(lock) \ | 27 | #define __LOCK(lock) \ |