diff options
author | Jacob Pan <jacob.jun.pan@intel.com> | 2010-02-12 05:29:11 -0500 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2010-02-24 02:15:19 -0500 |
commit | 5b78b6724a405d4b649db53f7aac28c930c89640 (patch) | |
tree | 481095f0ae027bc4ee663fb6799698f131edd9a4 /arch | |
parent | a712ffbc199849364c46e9112b93b66de08e2c26 (diff) |
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')
-rw-r--r-- | arch/x86/kernel/mrst.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/kernel/mrst.c b/arch/x86/kernel/mrst.c index 3b7078abc871..bdf9b17290c6 100644 --- a/arch/x86/kernel/mrst.c +++ b/arch/x86/kernel/mrst.c | |||
@@ -12,6 +12,9 @@ | |||
12 | #include <linux/init.h> | 12 | #include <linux/init.h> |
13 | 13 | ||
14 | #include <asm/setup.h> | 14 | #include <asm/setup.h> |
15 | #include <asm/mrst.h> | ||
16 | #include <asm/io.h> | ||
17 | #include <asm/i8259.h> | ||
15 | 18 | ||
16 | /* | 19 | /* |
17 | * Moorestown specific x86_init function overrides and early setup | 20 | * Moorestown specific x86_init function overrides and early setup |
@@ -21,4 +24,6 @@ void __init x86_mrst_early_setup(void) | |||
21 | { | 24 | { |
22 | x86_init.resources.probe_roms = x86_init_noop; | 25 | x86_init.resources.probe_roms = x86_init_noop; |
23 | x86_init.resources.reserve_resources = x86_init_noop; | 26 | x86_init.resources.reserve_resources = x86_init_noop; |
27 | |||
28 | legacy_pic = &null_legacy_pic; | ||
24 | } | 29 | } |