diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-13 03:28:45 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-13 03:28:45 -0400 |
| commit | 9343af084c7e8911897b0883042ee690cee3aaef (patch) | |
| tree | 6211a4bdc84690bec6530d27a3abb19f5e8bb8f3 /kernel/timer.c | |
| parent | e182c77cc291456eed127b1472952ddb59a81a9d (diff) | |
| parent | 0d0fb0f9c5fddef4a10242fe3337f00f528a3099 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
lib/Kconfig.debug
Diffstat (limited to 'kernel/timer.c')
| -rw-r--r-- | kernel/timer.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/timer.c b/kernel/timer.c index fc965eae0e87..aeb6a54f2771 100644 --- a/kernel/timer.c +++ b/kernel/timer.c | |||
| @@ -39,6 +39,7 @@ | |||
| 39 | #include <linux/kallsyms.h> | 39 | #include <linux/kallsyms.h> |
| 40 | #include <linux/perf_event.h> | 40 | #include <linux/perf_event.h> |
| 41 | #include <linux/sched.h> | 41 | #include <linux/sched.h> |
| 42 | #include <linux/slab.h> | ||
| 42 | 43 | ||
| 43 | #include <asm/uaccess.h> | 44 | #include <asm/uaccess.h> |
| 44 | #include <asm/unistd.h> | 45 | #include <asm/unistd.h> |