Skip to content

Commit

Permalink
x86, mrst: Add i8042_detect API for Moorestwon platform
Browse files Browse the repository at this point in the history
It will just return 0 as there is no i8042 controller

Signed-off-by: Feng Tang <feng.tang@intel.com>
LKML-Reference: <1278342202-10973-3-git-send-email-feng.tang@intel.com>
Acked-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
  • Loading branch information
Feng Tang authored and H. Peter Anvin committed Jul 8, 2010
1 parent c516ac5 commit 6d2cce6
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions arch/x86/kernel/mrst.c
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,12 @@ static void __init mrst_setup_boot_clock(void)
setup_boot_APIC_clock();
};

/* MID systems don't have i8042 controller */
static int mrst_i8042_detect(void)
{
return 0;
}

/*
* Moorestown specific x86_init function overrides and early setup
* calls.
Expand All @@ -233,6 +239,7 @@ void __init x86_mrst_early_setup(void)
x86_cpuinit.setup_percpu_clockev = mrst_setup_secondary_clock;

x86_platform.calibrate_tsc = mrst_calibrate_tsc;
x86_platform.i8042_detect = mrst_i8042_detect;
x86_init.pci.init = pci_mrst_init;
x86_init.pci.fixup_irqs = x86_init_noop;

Expand Down

0 comments on commit 6d2cce6

Please sign in to comment.