diff options
author | Masanari Iida <standby24x7@gmail.com> | 2017-03-07 06:48:02 -0500 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2017-03-24 10:47:57 -0400 |
commit | 0ba42a599fbf59a55c1ffedb980be3726c734433 (patch) | |
tree | 14323811b6b6723cd7aa3e63198defca98991201 /kernel/time | |
parent | 3d2e03f8172ead69e0946b764cf43cde4a4f0e3e (diff) |
treewide: Fix typo in xml/driver-api/basics.xml
This patch fix spelling typos found in
Documentation/output/xml/driver-api/basics.xml.
It is because the xml file was generated from comments in source,
so I had to fix the comments.
Signed-off-by: Masanari Iida <standby24x7@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'kernel/time')
-rw-r--r-- | kernel/time/hrtimer.c | 2 | ||||
-rw-r--r-- | kernel/time/timer.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c index ec08f527d7ee..a7098f0737ed 100644 --- a/kernel/time/hrtimer.c +++ b/kernel/time/hrtimer.c | |||
@@ -987,7 +987,7 @@ EXPORT_SYMBOL_GPL(hrtimer_start_range_ns); | |||
987 | * Returns: | 987 | * Returns: |
988 | * 0 when the timer was not active | 988 | * 0 when the timer was not active |
989 | * 1 when the timer was active | 989 | * 1 when the timer was active |
990 | * -1 when the timer is currently excuting the callback function and | 990 | * -1 when the timer is currently executing the callback function and |
991 | * cannot be stopped | 991 | * cannot be stopped |
992 | */ | 992 | */ |
993 | int hrtimer_try_to_cancel(struct hrtimer *timer) | 993 | int hrtimer_try_to_cancel(struct hrtimer *timer) |
diff --git a/kernel/time/timer.c b/kernel/time/timer.c index 1dc0256bfb6e..17610d2ddab1 100644 --- a/kernel/time/timer.c +++ b/kernel/time/timer.c | |||
@@ -1120,7 +1120,7 @@ void add_timer_on(struct timer_list *timer, int cpu) | |||
1120 | EXPORT_SYMBOL_GPL(add_timer_on); | 1120 | EXPORT_SYMBOL_GPL(add_timer_on); |
1121 | 1121 | ||
1122 | /** | 1122 | /** |
1123 | * del_timer - deactive a timer. | 1123 | * del_timer - deactivate a timer. |
1124 | * @timer: the timer to be deactivated | 1124 | * @timer: the timer to be deactivated |
1125 | * | 1125 | * |
1126 | * del_timer() deactivates a timer - this works on both active and inactive | 1126 | * del_timer() deactivates a timer - this works on both active and inactive |