diff options
| author | Olof Johansson <olof@lixom.net> | 2012-05-10 09:21:11 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-05-10 09:23:17 +0200 |
| commit | caafc71b1a25096ef74904adb19d37e5c6a282dc (patch) | |
| tree | 17f0602c6e04fdec78c50a1c2cbd70a0303ed2c6 /arch/x86/kernel/x86_init.c | |
| parent | Merge branch 'for-3.5/debug' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | ARM: davinci: optimize the DMA ISR (diff) | |
| download | linux-caafc71b1a25096ef74904adb19d37e5c6a282dc.tar.xz linux-caafc71b1a25096ef74904adb19d37e5c6a282dc.zip | |
Merge tag 'v3.5-soc' of git://gitorious.org/linux-davinci/linux-davinci into next/drivers
DaVinci SoC updates for v3.5
This pull request updates the DaVinci SoC support to implement DEBUG_LL port
choice and optimizes the DMA ISR by removing unnecessary register reads.
* tag 'v3.5-soc' of git://gitorious.org/linux-davinci/linux-davinci:
ARM: davinci: optimize the DMA ISR
ARM: davinci: implement DEBUG_LL port choice
+ sync with Linux 3.4-rc6
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/x86/kernel/x86_init.c')
| -rw-r--r-- | arch/x86/kernel/x86_init.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c index e9f265fd79ae..9cf71d0b2d37 100644 --- a/arch/x86/kernel/x86_init.c +++ b/arch/x86/kernel/x86_init.c @@ -93,7 +93,6 @@ struct x86_init_ops x86_init __initdata = { struct x86_cpuinit_ops x86_cpuinit __cpuinitdata = { .early_percpu_clock_init = x86_init_noop, .setup_percpu_clockev = setup_secondary_APIC_clock, - .fixup_cpu_id = x86_default_fixup_cpu_id, }; static void default_nmi_init(void) { }; |