diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2008-01-30 13:30:18 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 13:30:18 +0100 |
| commit | 70a20025632ca320316b5068326784d07c8ff351 (patch) | |
| tree | 06e3098d91423fe58d1a658c97ecd8af3bb042c6 /arch/x86 | |
| parent | 80ca9c98f50c11b63b87971594d7e38cba0bbcef (diff) | |
| download | linux-70a20025632ca320316b5068326784d07c8ff351.tar.bz2 | |
x86: move pmtmr related declarations
Move more stuff out of proto.h
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kernel/apic_64.c | 1 | ||||
| -rw-r--r-- | arch/x86/kernel/pmtimer_64.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c index 3de3764a862c..0cb14d4c2c5c 100644 --- a/arch/x86/kernel/apic_64.c +++ b/arch/x86/kernel/apic_64.c @@ -26,6 +26,7 @@ #include <linux/module.h> #include <linux/ioport.h> #include <linux/clockchips.h> +#include <linux/acpi_pmtmr.h> #include <asm/atomic.h> #include <asm/smp.h> diff --git a/arch/x86/kernel/pmtimer_64.c b/arch/x86/kernel/pmtimer_64.c index ae8f91214f15..b112406f1996 100644 --- a/arch/x86/kernel/pmtimer_64.c +++ b/arch/x86/kernel/pmtimer_64.c @@ -19,13 +19,13 @@ #include <linux/time.h> #include <linux/init.h> #include <linux/cpumask.h> +#include <linux/acpi_pmtmr.h> + #include <asm/io.h> #include <asm/proto.h> #include <asm/msr.h> #include <asm/vsyscall.h> -#define ACPI_PM_MASK 0xFFFFFF /* limit it to 24 bits */ - static inline u32 cyc2us(u32 cycles) { /* The Power Management Timer ticks at 3.579545 ticks per microsecond. |