aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-07 02:08:19 -0400
committerIngo Molnar <mingo@elte.hu>2008-07-07 02:08:19 -0400
commit4d51c7587bb13dbb2fafcad6c0b5231bd864b55f (patch)
tree13b10b3ff1df60032a7bb1c924a21d5399b9ff2b
parentd763d5edf945eec47bd443b699f174976f0afc13 (diff)
parentf4628e644c34d9e6242ea18487b2ed58ee04e3eb (diff)
Merge branch 'tracing/mmiotrace-mergefixups' into tracing/mmiotrace
-rw-r--r--arch/x86/mm/kmmio.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/mm/kmmio.c b/arch/x86/mm/kmmio.c
index b65871e6bba6..93d82038af4b 100644
--- a/arch/x86/mm/kmmio.c
+++ b/arch/x86/mm/kmmio.c
@@ -6,6 +6,7 @@
6 */ 6 */
7 7
8#include <linux/list.h> 8#include <linux/list.h>
9#include <linux/rculist.h>
9#include <linux/spinlock.h> 10#include <linux/spinlock.h>
10#include <linux/hash.h> 11#include <linux/hash.h>
11#include <linux/init.h> 12#include <linux/init.h>