diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-generic/memory_model.h | 2 | ||||
-rw-r--r-- | include/asm-generic/unistd.h | 2 | ||||
-rw-r--r-- | include/linux/chio.h | 2 | ||||
-rw-r--r-- | include/linux/mfd/ezx-pcap.h | 4 | ||||
-rw-r--r-- | include/linux/pktcdvd.h | 2 | ||||
-rw-r--r-- | include/linux/serial_reg.h | 8 | ||||
-rw-r--r-- | include/linux/videodev2.h | 2 | ||||
-rw-r--r-- | include/net/sctp/structs.h | 2 | ||||
-rw-r--r-- | include/net/tcp.h | 2 | ||||
-rw-r--r-- | include/net/wimax.h | 2 | ||||
-rw-r--r-- | include/sound/wm8993.h | 2 |
11 files changed, 15 insertions, 15 deletions
diff --git a/include/asm-generic/memory_model.h b/include/asm-generic/memory_model.h index 4c8d0afae711..fb2d63f13f4c 100644 --- a/include/asm-generic/memory_model.h +++ b/include/asm-generic/memory_model.h | |||
@@ -47,7 +47,7 @@ | |||
47 | 47 | ||
48 | #elif defined(CONFIG_SPARSEMEM_VMEMMAP) | 48 | #elif defined(CONFIG_SPARSEMEM_VMEMMAP) |
49 | 49 | ||
50 | /* memmap is virtually contigious. */ | 50 | /* memmap is virtually contiguous. */ |
51 | #define __pfn_to_page(pfn) (vmemmap + (pfn)) | 51 | #define __pfn_to_page(pfn) (vmemmap + (pfn)) |
52 | #define __page_to_pfn(page) (unsigned long)((page) - vmemmap) | 52 | #define __page_to_pfn(page) (unsigned long)((page) - vmemmap) |
53 | 53 | ||
diff --git a/include/asm-generic/unistd.h b/include/asm-generic/unistd.h index d76b66acea95..7c38c147e5e6 100644 --- a/include/asm-generic/unistd.h +++ b/include/asm-generic/unistd.h | |||
@@ -631,7 +631,7 @@ __SYSCALL(__NR_perf_event_open, sys_perf_event_open) | |||
631 | * these are provided for both review and as a porting | 631 | * these are provided for both review and as a porting |
632 | * help for the C library version. | 632 | * help for the C library version. |
633 | * | 633 | * |
634 | * Last chance: are any of these important enought to | 634 | * Last chance: are any of these important enough to |
635 | * enable by default? | 635 | * enable by default? |
636 | */ | 636 | */ |
637 | #ifdef __ARCH_WANT_SYSCALL_NO_AT | 637 | #ifdef __ARCH_WANT_SYSCALL_NO_AT |
diff --git a/include/linux/chio.h b/include/linux/chio.h index 519248d8b2b6..d9bac7f97282 100644 --- a/include/linux/chio.h +++ b/include/linux/chio.h | |||
@@ -21,7 +21,7 @@ | |||
21 | * query vendor-specific element types | 21 | * query vendor-specific element types |
22 | * | 22 | * |
23 | * accessing elements works by specifing type and unit of the element. | 23 | * accessing elements works by specifing type and unit of the element. |
24 | * for eample, storage elements are addressed with type = CHET_ST and | 24 | * for example, storage elements are addressed with type = CHET_ST and |
25 | * unit = 0 .. cp_nslots-1 | 25 | * unit = 0 .. cp_nslots-1 |
26 | * | 26 | * |
27 | */ | 27 | */ |
diff --git a/include/linux/mfd/ezx-pcap.h b/include/linux/mfd/ezx-pcap.h index e5124ceea769..3402042ddc31 100644 --- a/include/linux/mfd/ezx-pcap.h +++ b/include/linux/mfd/ezx-pcap.h | |||
@@ -45,7 +45,7 @@ void pcap_set_ts_bits(struct pcap_chip *, u32); | |||
45 | #define PCAP_CLEAR_INTERRUPT_REGISTER 0x01ffffff | 45 | #define PCAP_CLEAR_INTERRUPT_REGISTER 0x01ffffff |
46 | #define PCAP_MASK_ALL_INTERRUPT 0x01ffffff | 46 | #define PCAP_MASK_ALL_INTERRUPT 0x01ffffff |
47 | 47 | ||
48 | /* registers acessible by both pcap ports */ | 48 | /* registers accessible by both pcap ports */ |
49 | #define PCAP_REG_ISR 0x0 /* Interrupt Status */ | 49 | #define PCAP_REG_ISR 0x0 /* Interrupt Status */ |
50 | #define PCAP_REG_MSR 0x1 /* Interrupt Mask */ | 50 | #define PCAP_REG_MSR 0x1 /* Interrupt Mask */ |
51 | #define PCAP_REG_PSTAT 0x2 /* Processor Status */ | 51 | #define PCAP_REG_PSTAT 0x2 /* Processor Status */ |
@@ -67,7 +67,7 @@ void pcap_set_ts_bits(struct pcap_chip *, u32); | |||
67 | #define PCAP_REG_VENDOR_TEST1 0x1e | 67 | #define PCAP_REG_VENDOR_TEST1 0x1e |
68 | #define PCAP_REG_VENDOR_TEST2 0x1f | 68 | #define PCAP_REG_VENDOR_TEST2 0x1f |
69 | 69 | ||
70 | /* registers acessible by pcap port 1 only (a1200, e2 & e6) */ | 70 | /* registers accessible by pcap port 1 only (a1200, e2 & e6) */ |
71 | #define PCAP_REG_INT_SEL 0x3 /* Interrupt Select */ | 71 | #define PCAP_REG_INT_SEL 0x3 /* Interrupt Select */ |
72 | #define PCAP_REG_SWCTRL 0x4 /* Switching Regulator Control */ | 72 | #define PCAP_REG_SWCTRL 0x4 /* Switching Regulator Control */ |
73 | #define PCAP_REG_VREG1 0x5 /* Regulator Bank 1 Control */ | 73 | #define PCAP_REG_VREG1 0x5 /* Regulator Bank 1 Control */ |
diff --git a/include/linux/pktcdvd.h b/include/linux/pktcdvd.h index d745f5b6c7b0..76e5053e1fac 100644 --- a/include/linux/pktcdvd.h +++ b/include/linux/pktcdvd.h | |||
@@ -30,7 +30,7 @@ | |||
30 | 30 | ||
31 | /* | 31 | /* |
32 | * use drive write caching -- we need deferred error handling to be | 32 | * use drive write caching -- we need deferred error handling to be |
33 | * able to sucessfully recover with this option (drive will return good | 33 | * able to successfully recover with this option (drive will return good |
34 | * status as soon as the cdb is validated). | 34 | * status as soon as the cdb is validated). |
35 | */ | 35 | */ |
36 | #if defined(CONFIG_CDROM_PKTCDVD_WCACHE) | 36 | #if defined(CONFIG_CDROM_PKTCDVD_WCACHE) |
diff --git a/include/linux/serial_reg.h b/include/linux/serial_reg.h index 850db2e80510..cf9327c051ad 100644 --- a/include/linux/serial_reg.h +++ b/include/linux/serial_reg.h | |||
@@ -216,10 +216,10 @@ | |||
216 | 216 | ||
217 | #define UART_IIR_TOD 0x08 /* Character Timeout Indication Detected */ | 217 | #define UART_IIR_TOD 0x08 /* Character Timeout Indication Detected */ |
218 | 218 | ||
219 | #define UART_FCR_PXAR1 0x00 /* receive FIFO treshold = 1 */ | 219 | #define UART_FCR_PXAR1 0x00 /* receive FIFO threshold = 1 */ |
220 | #define UART_FCR_PXAR8 0x40 /* receive FIFO treshold = 8 */ | 220 | #define UART_FCR_PXAR8 0x40 /* receive FIFO threshold = 8 */ |
221 | #define UART_FCR_PXAR16 0x80 /* receive FIFO treshold = 16 */ | 221 | #define UART_FCR_PXAR16 0x80 /* receive FIFO threshold = 16 */ |
222 | #define UART_FCR_PXAR32 0xc0 /* receive FIFO treshold = 32 */ | 222 | #define UART_FCR_PXAR32 0xc0 /* receive FIFO threshold = 32 */ |
223 | 223 | ||
224 | 224 | ||
225 | 225 | ||
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h index b59e78c57161..dfd4745a955f 100644 --- a/include/linux/videodev2.h +++ b/include/linux/videodev2.h | |||
@@ -490,7 +490,7 @@ struct v4l2_jpegcompression { | |||
490 | * you do, leave them untouched. | 490 | * you do, leave them untouched. |
491 | * Inluding less markers will make the | 491 | * Inluding less markers will make the |
492 | * resulting code smaller, but there will | 492 | * resulting code smaller, but there will |
493 | * be fewer aplications which can read it. | 493 | * be fewer applications which can read it. |
494 | * The presence of the APP and COM marker | 494 | * The presence of the APP and COM marker |
495 | * is influenced by APP_len and COM_len | 495 | * is influenced by APP_len and COM_len |
496 | * ONLY, not by this property! */ | 496 | * ONLY, not by this property! */ |
diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h index 6e5f0e0c7967..ca4789e4f1e1 100644 --- a/include/net/sctp/structs.h +++ b/include/net/sctp/structs.h | |||
@@ -988,7 +988,7 @@ struct sctp_transport { | |||
988 | int init_sent_count; | 988 | int init_sent_count; |
989 | 989 | ||
990 | /* state : The current state of this destination, | 990 | /* state : The current state of this destination, |
991 | * : i.e. SCTP_ACTIVE, SCTP_INACTIVE, SCTP_UNKOWN. | 991 | * : i.e. SCTP_ACTIVE, SCTP_INACTIVE, SCTP_UNKNOWN. |
992 | */ | 992 | */ |
993 | int state; | 993 | int state; |
994 | 994 | ||
diff --git a/include/net/tcp.h b/include/net/tcp.h index 03a49c703377..1827e7f217d1 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h | |||
@@ -1260,7 +1260,7 @@ static inline struct sk_buff *tcp_write_queue_prev(struct sock *sk, struct sk_bu | |||
1260 | skb_queue_walk_from_safe(&(sk)->sk_write_queue, skb, tmp) | 1260 | skb_queue_walk_from_safe(&(sk)->sk_write_queue, skb, tmp) |
1261 | 1261 | ||
1262 | /* This function calculates a "timeout" which is equivalent to the timeout of a | 1262 | /* This function calculates a "timeout" which is equivalent to the timeout of a |
1263 | * TCP connection after "boundary" unsucessful, exponentially backed-off | 1263 | * TCP connection after "boundary" unsuccessful, exponentially backed-off |
1264 | * retransmissions with an initial RTO of TCP_RTO_MIN. | 1264 | * retransmissions with an initial RTO of TCP_RTO_MIN. |
1265 | */ | 1265 | */ |
1266 | static inline bool retransmits_timed_out(const struct sock *sk, | 1266 | static inline bool retransmits_timed_out(const struct sock *sk, |
diff --git a/include/net/wimax.h b/include/net/wimax.h index 2af7bf839f23..3b07f6aad102 100644 --- a/include/net/wimax.h +++ b/include/net/wimax.h | |||
@@ -79,7 +79,7 @@ | |||
79 | * drivers have to only report state changes due to external | 79 | * drivers have to only report state changes due to external |
80 | * conditions. | 80 | * conditions. |
81 | * | 81 | * |
82 | * All API operations are 'atomic', serialized thorough a mutex in the | 82 | * All API operations are 'atomic', serialized through a mutex in the |
83 | * `struct wimax_dev`. | 83 | * `struct wimax_dev`. |
84 | * | 84 | * |
85 | * EXPORTING TO USER SPACE THROUGH GENERIC NETLINK | 85 | * EXPORTING TO USER SPACE THROUGH GENERIC NETLINK |
diff --git a/include/sound/wm8993.h b/include/sound/wm8993.h index 9c661f2f8cda..eee19f63c0d8 100644 --- a/include/sound/wm8993.h +++ b/include/sound/wm8993.h | |||
@@ -36,7 +36,7 @@ struct wm8993_platform_data { | |||
36 | unsigned int micbias1_lvl:1; | 36 | unsigned int micbias1_lvl:1; |
37 | unsigned int micbias2_lvl:1; | 37 | unsigned int micbias2_lvl:1; |
38 | 38 | ||
39 | /* Jack detect threashold levels, see datasheet for values */ | 39 | /* Jack detect threshold levels, see datasheet for values */ |
40 | unsigned int jd_scthr:2; | 40 | unsigned int jd_scthr:2; |
41 | unsigned int jd_thr:2; | 41 | unsigned int jd_thr:2; |
42 | }; | 42 | }; |