diff options
| author |   Masanari Iida <standby24x7@gmail.com> | 2017-03-07 20:48:02 +0900 |
|---|---|---|
| committer |   Jiri Kosina <jkosina@suse.cz> | 2017-03-24 15:47:57 +0100 |
| commit | 0ba42a599fbf59a55c1ffedb980be3726c734433 (patch) | |
| tree | 14323811b6b6723cd7aa3e63198defca98991201 /kernel/time | |
| parent | tools/testing/selftests/powerpc: remove redundant CFLAGS in Makefile: "-Wall -O2 -Wall" -> "-O2 -Wall" (diff) | |
| download | linux-dev-0ba42a599fbf59a55c1ffedb980be3726c734433.tar.xz linux-dev-0ba42a599fbf59a55c1ffedb980be3726c734433.zip | |
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); * Returns: * 0 when the timer was not active * 1 when the timer was active - * -1 when the timer is currently excuting the callback function and + * -1 when the timer is currently executing the callback function and * cannot be stopped */ 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) EXPORT_SYMBOL_GPL(add_timer_on); /** - * del_timer - deactive a timer. + * del_timer - deactivate a timer. * @timer: the timer to be deactivated * * del_timer() deactivates a timer - this works on both active and inactive |