diff options
author | 2012-03-30 08:47:19 +0200 | |
---|---|---|
committer | 2012-03-30 08:50:06 +0200 | |
commit | 186e54cbe1145f4d11e32fe10e7e20a11f1b27dd (patch) | |
tree | 9b6cf3667a3ea90e0cec0ea7119688ba76c55a71 /lib/fault-inject.c | |
parent | x86: Preserve lazy irq disable semantics in fixup_irqs() (diff) | |
parent | Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc (diff) | |
download | linux-dev-186e54cbe1145f4d11e32fe10e7e20a11f1b27dd.tar.xz linux-dev-186e54cbe1145f4d11e32fe10e7e20a11f1b27dd.zip |
Merge branch 'linus' into x86/urgent
Merge reason: Needed for include file dependencies.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'lib/fault-inject.c')
-rw-r--r-- | lib/fault-inject.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/fault-inject.c b/lib/fault-inject.c index b4801f51b607..6805453c18e7 100644 --- a/lib/fault-inject.c +++ b/lib/fault-inject.c @@ -5,7 +5,7 @@ #include <linux/stat.h> #include <linux/types.h> #include <linux/fs.h> -#include <linux/module.h> +#include <linux/export.h> #include <linux/interrupt.h> #include <linux/stacktrace.h> #include <linux/fault-inject.h> |