---

yaml --- r: 186965 b: refs/heads/master c: 5b78b67 h: refs/heads/master i: 186963: 45b67b7 v: v3
git-mirror · Feb 24, 2010 · aef8a19 · aef8a19
1 parent 19eaa22
commit aef8a19
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a712ffbc199849364c46e9112b93b66de08e2c26
+refs/heads/master: 5b78b6724a405d4b649db53f7aac28c930c89640
diff --git a/trunk/arch/x86/kernel/mrst.c b/trunk/arch/x86/kernel/mrst.c
@@ -12,6 +12,9 @@
 #include <linux/init.h>
 
 #include <asm/setup.h>
+#include <asm/mrst.h>
+#include <asm/io.h>
+#include <asm/i8259.h>
 
 /*
  * Moorestown specific x86_init function overrides and early setup
@@ -21,4 +24,6 @@ void __init x86_mrst_early_setup(void)
 {
 	x86_init.resources.probe_roms = x86_init_noop;
 	x86_init.resources.reserve_resources = x86_init_noop;
+
+	legacy_pic = &null_legacy_pic;
 }