diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2012-05-12 23:48:21 +0200 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-05-12 23:48:21 +0200 |
| commit | 2870f5352451a99a364a807803e4c39477264c3c (patch) | |
| tree | 11ee9795559bdc9645a0a17815611c624066c515 /arch/x86/kernel/x86_init.c | |
| parent | ARM: EXYNOS: Adapt to cpuidle core time keeping and irq enable (diff) | |
| parent | ARM: S3C24XX: Use common macro to define resources on mach-qt2410.c (diff) | |
| download | linux-2870f5352451a99a364a807803e4c39477264c3c.tar.xz linux-2870f5352451a99a364a807803e4c39477264c3c.zip | |
Merge branch 'next/cleanup-samsung-macro' into next/cleanup-samsung
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) { }; |