diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2014-08-07 14:07:57 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-08-07 14:07:57 -0400 |
| commit | 82df9c8bebeff610705f30315f3903cbcb3aa58b (patch) | |
| tree | 0d54eac4e7b46876111256caf169b22627441453 /Documentation/DocBook/device-drivers.tmpl | |
| parent | 19583ca584d6f574384e17fe7613dfaeadcdc4a6 (diff) | |
| parent | ccbf62d8a284cf181ac28c8e8407dd077d90dd4b (diff) | |
| download | linux-next-82df9c8bebeff610705f30315f3903cbcb3aa58b.tar.gz | |
Merge commit 'ccbf62d8a284cf181ac28c8e8407dd077d90dd4b' into for-next
backmerge to avoid kernel/acct.c conflict
Diffstat (limited to 'Documentation/DocBook/device-drivers.tmpl')
| -rw-r--r-- | Documentation/DocBook/device-drivers.tmpl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/DocBook/device-drivers.tmpl b/Documentation/DocBook/device-drivers.tmpl index cc63f30de166..6e06ebdbe0c7 100644 --- a/Documentation/DocBook/device-drivers.tmpl +++ b/Documentation/DocBook/device-drivers.tmpl @@ -54,7 +54,7 @@ !Ikernel/sched/cpupri.c !Ikernel/sched/fair.c !Iinclude/linux/completion.h -!Ekernel/timer.c +!Ekernel/time/timer.c </sect1> <sect1><title>Wait queues and Wake events</title> !Iinclude/linux/wait.h @@ -63,7 +63,7 @@ <sect1><title>High-resolution timers</title> !Iinclude/linux/ktime.h !Iinclude/linux/hrtimer.h -!Ekernel/hrtimer.c +!Ekernel/time/hrtimer.c </sect1> <sect1><title>Workqueues and Kevents</title> !Ekernel/workqueue.c |