aboutsummaryrefslogtreecommitdiff
path: root/arch/x86_64/kernel
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2007-10-11 11:14:26 +0200
committerThomas Gleixner <tglx@linutronix.de>2007-10-11 11:14:26 +0200
commit3940abdf5e7f62bf47c4117f9201c121fbb0ab16 (patch)
tree26fe2e4da4381a4631eb31f148633f0acecca4fb /arch/x86_64/kernel
parent5b8d883929091c647635392bafc8fc0962d4b43f (diff)
x86_64: prepare shared kernel/hpet.c
Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86_64/kernel')
-rw-r--r--arch/x86_64/kernel/Makefile2
-rw-r--r--arch/x86_64/kernel/hpet_64.c (renamed from arch/x86_64/kernel/hpet.c)0
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/Makefile b/arch/x86_64/kernel/Makefile
index fbaba5335b6..e717a324bd8 100644
--- a/arch/x86_64/kernel/Makefile
+++ b/arch/x86_64/kernel/Makefile
@@ -8,7 +8,7 @@ obj-y := process.o signal.o entry.o traps_64.o irq.o \
ptrace.o time.o ioport.o ldt.o setup.o i8259_64.o sys_x86_64.o \
x8664_ksyms.o i387.o syscall.o vsyscall.o \
setup64.o bootflag.o e820.o reboot.o quirks.o i8237.o \
- pci-dma_64.o pci-nommu.o alternative.o hpet.o tsc.o bugs.o \
+ pci-dma_64.o pci-nommu.o alternative.o hpet_64.o tsc.o bugs.o \
perfctr-watchdog.o
obj-$(CONFIG_STACKTRACE) += stacktrace.o
diff --git a/arch/x86_64/kernel/hpet.c b/arch/x86_64/kernel/hpet_64.c
index e2d1b912e15..e2d1b912e15 100644
--- a/arch/x86_64/kernel/hpet.c
+++ b/arch/x86_64/kernel/hpet_64.c