diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-05-03 09:25:35 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-05-03 09:25:35 -0400 |
| commit | d6d53cbc6b10d28646fb6184d1069f336ec76dc4 (patch) | |
| tree | 1c844b3ce8bd430becbbb74875898b08d9f89bb5 /kernel/trace/blktrace.c | |
| parent | 0b5adf92ec793c665b0de63ac146d190a921c391 (diff) | |
| parent | 6a740aa4f47b9f29bad5292cf51f008f3edad9b1 (diff) | |
Merge branch 'hid-suspend' into picolcd
Diffstat (limited to 'kernel/trace/blktrace.c')
| -rw-r--r-- | kernel/trace/blktrace.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c index 07f945a99430..b3bc91a3f510 100644 --- a/kernel/trace/blktrace.c +++ b/kernel/trace/blktrace.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <linux/percpu.h> | 21 | #include <linux/percpu.h> |
| 22 | #include <linux/init.h> | 22 | #include <linux/init.h> |
| 23 | #include <linux/mutex.h> | 23 | #include <linux/mutex.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | #include <linux/debugfs.h> | 25 | #include <linux/debugfs.h> |
| 25 | #include <linux/smp_lock.h> | 26 | #include <linux/smp_lock.h> |
| 26 | #include <linux/time.h> | 27 | #include <linux/time.h> |