diff options
| author | Feng Tang <feng.tang@intel.com> | 2012-04-28 14:30:40 +0800 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2012-05-24 23:16:14 +0200 |
| commit | 151766fce8bee0e3e6076c8b829f9fcc0a2412ae (patch) | |
| tree | ba8edcdbbab633ffd5194a1f43d3270854f57d75 /arch/x86/kernel/x86_init.c | |
| parent | f9369910a6225b8d4892c3f20ae740a711cd5ace (diff) | |
| download | linux-151766fce8bee0e3e6076c8b829f9fcc0a2412ae.tar.gz linux-151766fce8bee0e3e6076c8b829f9fcc0a2412ae.tar.bz2 linux-151766fce8bee0e3e6076c8b829f9fcc0a2412ae.zip | |
Revert "x86/platform: Add a wallclock_init func to x86_platforms ops"
This reverts commit cf8ff6b6ab0e99dd3058852f4ec76a6140abadec.
Just found this commit is a function duplicatation of commit 6b617e22
"x86/platform: Add a wallclock_init func to x86_init.timers ops".
Let's revert it and sorry for the noise.
Signed-off-by: Feng Tang <feng.tang@intel.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: H. Peter Anvin <hpa@linux.intel.com>
Cc: Jacob Pan <jacob.jun.pan@linux.intel.com>
Cc: Alan Cox <alan@linux.intel.com>
Cc: Dirk Brandewie <dirk.brandewie@gmail.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
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, |