diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-06-18 11:09:49 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-06-18 11:09:49 +0200 |
| commit | 8461689c67fc2ad3040bc019cccb541bccb5648f (patch) | |
| tree | eafcf756975739ef04aa91be2e053d6e1e8b9ccb /arch/x86/kernel/x86_init.c | |
| parent | d48daf37a3d2e2b28a61e615c0fc538301edb0dd (diff) | |
| parent | 7eb9ae0799b1e9f0b77733b432bc5f6f055b020b (diff) | |
| download | linux-8461689c67fc2ad3040bc019cccb541bccb5648f.tar.gz linux-8461689c67fc2ad3040bc019cccb541bccb5648f.tar.bz2 linux-8461689c67fc2ad3040bc019cccb541bccb5648f.zip | |
Merge branch 'x86/apic' into x86/platform
Merge in x86/apic to solve a vector_allocation_domain() API change semantic merge conflict.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/x86_init.c')
| -rw-r--r-- | arch/x86/kernel/x86_init.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c index 35c5e543f550..9f3167e891ef 100644 --- a/arch/x86/kernel/x86_init.c +++ b/arch/x86/kernel/x86_init.c @@ -29,7 +29,6 @@ void __init x86_init_uint_noop(unsigned int unused) { } void __init x86_init_pgd_noop(pgd_t *unused) { } int __init iommu_init_noop(void) { return 0; } void iommu_shutdown_noop(void) { } -void wallclock_init_noop(void) { } /* * The platform setup functions are preset with the default functions @@ -101,7 +100,6 @@ static int default_i8042_detect(void) { return 1; }; struct x86_platform_ops x86_platform = { .calibrate_tsc = native_calibrate_tsc, - .wallclock_init = wallclock_init_noop, .get_wallclock = mach_get_cmos_time, .set_wallclock = mach_set_rtc_mmss, .iommu_shutdown = iommu_shutdown_noop, |