diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-11 05:38:55 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-11 05:38:55 -0500 |
| commit | 891393745aad5c5acdb01b6ce61c08d4cc064649 (patch) | |
| tree | 7687b8b94c4bc4ec8d5f1106ff8ff4d557b2fabf /include/linux/blktrace_api.h | |
| parent | a448720ca3248e8a7a426336885549d6e923fd8e (diff) | |
| parent | 8e4921515c1a379539607eb443d51c30f4f7f338 (diff) | |
Merge commit 'v2.6.29-rc4' into x86/cleanups
Diffstat (limited to 'include/linux/blktrace_api.h')
| -rw-r--r-- | include/linux/blktrace_api.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h index 1dba3493d520..25379cba2370 100644 --- a/include/linux/blktrace_api.h +++ b/include/linux/blktrace_api.h | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | #ifndef BLKTRACE_H | 1 | #ifndef BLKTRACE_H |
| 2 | #define BLKTRACE_H | 2 | #define BLKTRACE_H |
| 3 | 3 | ||
| 4 | #include <linux/types.h> | ||
| 4 | #ifdef __KERNEL__ | 5 | #ifdef __KERNEL__ |
| 5 | #include <linux/blkdev.h> | 6 | #include <linux/blkdev.h> |
| 6 | #include <linux/relay.h> | 7 | #include <linux/relay.h> |