diff options
| author | Alok Kataria <akataria@vmware.com> | 2008-07-01 11:43:34 -0700 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-09 07:43:27 +0200 |
| commit | 8fbbc4b45ce3e4c0eeb15004c79c72b6896a79c2 (patch) | |
| tree | 3b7c8e4ee74ef5fec07f64ea56bff60afb433c2c /arch/x86/kernel/Makefile | |
| parent | 2dbe06faf37b39f9ecffc054dd173b2a1dc2adcd (diff) | |
| download | linux-8fbbc4b45ce3e4c0eeb15004c79c72b6896a79c2.tar.gz linux-8fbbc4b45ce3e4c0eeb15004c79c72b6896a79c2.tar.bz2 linux-8fbbc4b45ce3e4c0eeb15004c79c72b6896a79c2.zip | |
x86: merge tsc_init and clocksource code
Unify the clocksource code.
Unify the tsc_init code.
Signed-off-by: Alok N Kataria <akataria@vmware.com>
Signed-off-by: Dan Hecht <dhecht@vmware.com>
Cc: Dan Hecht <dhecht@vmware.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/Makefile')
| -rw-r--r-- | arch/x86/kernel/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index ca904ee17252..59b14c940a28 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile @@ -26,7 +26,7 @@ obj-$(CONFIG_X86_64) += syscall_64.o vsyscall_64.o obj-y += bootflag.o e820.o obj-y += pci-dma.o quirks.o i8237.o topology.o kdebugfs.o obj-y += alternative.o i8253.o pci-nommu.o -obj-y += tsc_$(BITS).o io_delay.o rtc.o tsc.o +obj-y += tsc.o io_delay.o rtc.o obj-$(CONFIG_X86_TRAMPOLINE) += trampoline.o obj-y += process.o |