diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-28 13:44:32 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-28 23:20:28 +0100 |
| commit | 9c7642470ecf03d8b4946a2addc8fe631b8426dd (patch) | |
| tree | ca3231588aeb790d52d9808d053f9c54f6bbc7c1 /arch/x86/mach-generic/es7000.c | |
| parent | 1322a2e2db87c938d8381f8501af9a4d0eab8bc7 (diff) | |
| download | kernel_samsung_smdk4412-9c7642470ecf03d8b4946a2addc8fe631b8426dd.zip kernel_samsung_smdk4412-9c7642470ecf03d8b4946a2addc8fe631b8426dd.tar.gz kernel_samsung_smdk4412-9c7642470ecf03d8b4946a2addc8fe631b8426dd.tar.bz2 | |
x86: consolidate the ->mps_oem_check() code
- spread out the mps_oem_check() namespace on a per APIC driver basis
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/mach-generic/es7000.c')
| -rw-r--r-- | arch/x86/mach-generic/es7000.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/mach-generic/es7000.c b/arch/x86/mach-generic/es7000.c index 52787e3..f861163 100644 --- a/arch/x86/mach-generic/es7000.c +++ b/arch/x86/mach-generic/es7000.c @@ -36,11 +36,12 @@ static int probe_es7000(void) } static __init int -mps_oem_check(struct mpc_table *mpc, char *oem, char *productid) +es7000_mps_oem_check(struct mpc_table *mpc, char *oem, char *productid) { if (mpc->oemptr) { struct mpc_oemtable *oem_table = (struct mpc_oemtable *)mpc->oemptr; + if (!strncmp(oem, "UNISYS", 6)) return parse_unisys_oem((char *)oem_table); } @@ -123,7 +124,7 @@ struct genapic apic_es7000 = { .check_phys_apicid_present = es7000_check_phys_apicid_present, .enable_apic_mode = es7000_enable_apic_mode, .phys_pkg_id = es7000_phys_pkg_id, - .mps_oem_check = mps_oem_check, + .mps_oem_check = es7000_mps_oem_check, .get_apic_id = get_apic_id, .set_apic_id = NULL, |