From aef8a19449212cb157a3c04d2dae6312d259eb48 Mon Sep 17 00:00:00 2001
From: Jacob Pan <jacob.jun.pan@intel.com>
Date: Fri, 12 Feb 2010 02:29:11 -0800
Subject: [PATCH] --- yaml --- r: 186965 b: refs/heads/master c:
 5b78b6724a405d4b649db53f7aac28c930c89640 h: refs/heads/master i:   186963:
 45b67b7ae41aee63872e5aa082f73136cac18022 v: v3

---
 [refs]                       | 2 +-
 trunk/arch/x86/kernel/mrst.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c88e5988a8a2..ba52916d755d 100644
--- 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
index 3b7078abc871..bdf9b17290c6 100644
--- 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;
 }