diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-10 21:03:30 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-10 21:03:30 -0500 |
| commit | f45ac22ae2b8fc5b4c32d9b8d17ea419a8701d89 (patch) | |
| tree | 8e05bccd7b85fc3dd2fbd33ec3286de27e152819 /lib/fault-inject.c | |
| parent | 79f3b3cb7a2586b319a43a7f29924c6c555e4357 (diff) | |
| parent | c59765042f53a79a7a65585042ff463b69cb248c (diff) | |
Merge commit 'v2.6.29-rc1' into x86/urgent
Diffstat (limited to 'lib/fault-inject.c')
| -rw-r--r-- | lib/fault-inject.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/fault-inject.c b/lib/fault-inject.c index a50a311554cc..f97af55bdd96 100644 --- a/lib/fault-inject.c +++ b/lib/fault-inject.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | #include <linux/fs.h> | 6 | #include <linux/fs.h> |
| 7 | #include <linux/module.h> | 7 | #include <linux/module.h> |
| 8 | #include <linux/interrupt.h> | 8 | #include <linux/interrupt.h> |
| 9 | #include <linux/unwind.h> | ||
| 10 | #include <linux/stacktrace.h> | 9 | #include <linux/stacktrace.h> |
| 11 | #include <linux/kallsyms.h> | 10 | #include <linux/kallsyms.h> |
| 12 | #include <linux/fault-inject.h> | 11 | #include <linux/fault-inject.h> |