summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/mrst.c
diff options
context:
space:
mode:
authorJacob Pan <jacob.jun.pan@intel.com>2010-02-12 02:29:11 -0800
committerH. Peter Anvin <hpa@zytor.com>2010-02-23 23:15:19 -0800
commit5b78b6724a405d4b649db53f7aac28c930c89640 (patch)
tree481095f0ae027bc4ee663fb6799698f131edd9a4 /arch/x86/kernel/mrst.c
parenta712ffbc199849364c46e9112b93b66de08e2c26 (diff)
downloadop-kernel-dev-5b78b6724a405d4b649db53f7aac28c930c89640.zip
op-kernel-dev-5b78b6724a405d4b649db53f7aac28c930c89640.tar.gz
x86, mrst: Add dummy legacy pic to platform setup
Moorestown has no legacy PIC; point it to the null legacy PIC. Signed-off-by: Jacob Pan <jacob.jun.pan@intel.com> LKML-Reference: <43F901BD926A4E43B106BF17856F07559FB80D09@orsmsx508.amr.corp.intel.com> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/kernel/mrst.c')
-rw-r--r--arch/x86/kernel/mrst.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/kernel/mrst.c b/arch/x86/kernel/mrst.c
index 3b7078a..bdf9b17 100644
--- a/arch/x86/kernel/mrst.c
+++ b/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;
}
OpenPOWER on IntegriCloud