diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/hil.h | 16 | ||||
-rw-r--r-- | include/linux/lru_cache.h | 2 | ||||
-rw-r--r-- | include/linux/sched.h | 2 | ||||
-rw-r--r-- | include/media/davinci/vpfe_capture.h | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/include/linux/hil.h b/include/linux/hil.h index 13352d7d0caf..523785a9de70 100644 --- a/include/linux/hil.h +++ b/include/linux/hil.h | |||
@@ -168,14 +168,14 @@ enum hil_command { | |||
168 | HIL_CMD_PR6 = 0x45, /* Prompt6 */ | 168 | HIL_CMD_PR6 = 0x45, /* Prompt6 */ |
169 | HIL_CMD_PR7 = 0x46, /* Prompt7 */ | 169 | HIL_CMD_PR7 = 0x46, /* Prompt7 */ |
170 | HIL_CMD_PRM = 0x47, /* Prompt (General Purpose) */ | 170 | HIL_CMD_PRM = 0x47, /* Prompt (General Purpose) */ |
171 | HIL_CMD_AK1 = 0x48, /* Acknowlege1 */ | 171 | HIL_CMD_AK1 = 0x48, /* Acknowledge1 */ |
172 | HIL_CMD_AK2 = 0x49, /* Acknowlege2 */ | 172 | HIL_CMD_AK2 = 0x49, /* Acknowledge2 */ |
173 | HIL_CMD_AK3 = 0x4a, /* Acknowlege3 */ | 173 | HIL_CMD_AK3 = 0x4a, /* Acknowledge3 */ |
174 | HIL_CMD_AK4 = 0x4b, /* Acknowlege4 */ | 174 | HIL_CMD_AK4 = 0x4b, /* Acknowledge4 */ |
175 | HIL_CMD_AK5 = 0x4c, /* Acknowlege5 */ | 175 | HIL_CMD_AK5 = 0x4c, /* Acknowledge5 */ |
176 | HIL_CMD_AK6 = 0x4d, /* Acknowlege6 */ | 176 | HIL_CMD_AK6 = 0x4d, /* Acknowledge6 */ |
177 | HIL_CMD_AK7 = 0x4e, /* Acknowlege7 */ | 177 | HIL_CMD_AK7 = 0x4e, /* Acknowledge7 */ |
178 | HIL_CMD_ACK = 0x4f, /* Acknowlege (General Purpose) */ | 178 | HIL_CMD_ACK = 0x4f, /* Acknowledge (General Purpose) */ |
179 | 179 | ||
180 | /* 0x50 to 0x78 reserved for future use */ | 180 | /* 0x50 to 0x78 reserved for future use */ |
181 | /* 0x80 to 0xEF device-specific commands */ | 181 | /* 0x80 to 0xEF device-specific commands */ |
diff --git a/include/linux/lru_cache.h b/include/linux/lru_cache.h index 3a2b2d9b0472..de48d167568b 100644 --- a/include/linux/lru_cache.h +++ b/include/linux/lru_cache.h | |||
@@ -64,7 +64,7 @@ For crash recovery after replication node failure, | |||
64 | usually the condition is softened to regions that _may_ have been target of | 64 | usually the condition is softened to regions that _may_ have been target of |
65 | in-flight WRITE IO, e.g. by only lazily clearing the on-disk write-intent | 65 | in-flight WRITE IO, e.g. by only lazily clearing the on-disk write-intent |
66 | bitmap, trading frequency of meta data transactions against amount of | 66 | bitmap, trading frequency of meta data transactions against amount of |
67 | (possibly unneccessary) resync traffic. | 67 | (possibly unnecessary) resync traffic. |
68 | 68 | ||
69 | If we set a hard limit on the area that may be "hot" at any given time, we | 69 | If we set a hard limit on the area that may be "hot" at any given time, we |
70 | limit the amount of resync traffic needed for crash recovery. | 70 | limit the amount of resync traffic needed for crash recovery. |
diff --git a/include/linux/sched.h b/include/linux/sched.h index abdfacc58653..a70957b138ed 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
@@ -1533,7 +1533,7 @@ struct task_struct { | |||
1533 | 1533 | ||
1534 | struct list_head *scm_work_list; | 1534 | struct list_head *scm_work_list; |
1535 | #ifdef CONFIG_FUNCTION_GRAPH_TRACER | 1535 | #ifdef CONFIG_FUNCTION_GRAPH_TRACER |
1536 | /* Index of current stored adress in ret_stack */ | 1536 | /* Index of current stored address in ret_stack */ |
1537 | int curr_ret_stack; | 1537 | int curr_ret_stack; |
1538 | /* Stack of return addresses for return function tracing */ | 1538 | /* Stack of return addresses for return function tracing */ |
1539 | struct ftrace_ret_stack *ret_stack; | 1539 | struct ftrace_ret_stack *ret_stack; |
diff --git a/include/media/davinci/vpfe_capture.h b/include/media/davinci/vpfe_capture.h index d863e5e8426d..4314a5f6a087 100644 --- a/include/media/davinci/vpfe_capture.h +++ b/include/media/davinci/vpfe_capture.h | |||
@@ -165,7 +165,7 @@ struct vpfe_device { | |||
165 | u8 started; | 165 | u8 started; |
166 | /* | 166 | /* |
167 | * offset where second field starts from the starting of the | 167 | * offset where second field starts from the starting of the |
168 | * buffer for field seperated YCbCr formats | 168 | * buffer for field separated YCbCr formats |
169 | */ | 169 | */ |
170 | u32 field_off; | 170 | u32 field_off; |
171 | }; | 171 | }; |