summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2008-01-30 13:30:18 +0100
committerIngo Molnar <mingo@elte.hu>2008-01-30 13:30:18 +0100
commit70a20025632ca320316b5068326784d07c8ff351 (patch)
tree06e3098d91423fe58d1a658c97ecd8af3bb042c6 /include
parent80ca9c98f50c11b63b87971594d7e38cba0bbcef (diff)
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 'include')
-rw-r--r--include/asm-x86/proto.h9
-rw-r--r--include/linux/acpi_pmtmr.h2
2 files changed, 2 insertions, 9 deletions
diff --git a/include/asm-x86/proto.h b/include/asm-x86/proto.h
index a47e526716f4..9074aa7ebc65 100644
--- a/include/asm-x86/proto.h
+++ b/include/asm-x86/proto.h
@@ -25,15 +25,6 @@ extern void ia32_sysenter_target(void);
extern void config_acpi_tables(void);
extern void ia32_syscall(void);
-extern int pmtimer_mark_offset(void);
-extern void pmtimer_resume(void);
-extern void pmtimer_wait(unsigned);
-extern unsigned int do_gettimeoffset_pm(void);
-#ifdef CONFIG_X86_PM_TIMER
-extern u32 pmtmr_ioport;
-#else
-#define pmtmr_ioport 0
-#endif
extern int nohpet;
extern void reserve_bootmem_generic(unsigned long phys, unsigned len);
diff --git a/include/linux/acpi_pmtmr.h b/include/linux/acpi_pmtmr.h
index 1d0ef1ae8036..7e3d2859be50 100644
--- a/include/linux/acpi_pmtmr.h
+++ b/include/linux/acpi_pmtmr.h
@@ -25,6 +25,8 @@ static inline u32 acpi_pm_read_early(void)
return acpi_pm_read_verified() & ACPI_PM_MASK;
}
+extern void pmtimer_wait(unsigned);
+
#else
static inline u32 acpi_pm_read_early(void)