summaryrefslogtreecommitdiffstats
path: root/include/linux/acpi_pmtmr.h
diff options
context:
space:
mode:
authorH. Peter Anvin2010-10-20 23:22:45 +0200
committerH. Peter Anvin2010-10-20 23:22:45 +0200
commitd25e6b0b326278a1096e8334584c3e64517057a3 (patch)
tree3c914b877adf9615c7158b58705478e56c9b4247 /include/linux/acpi_pmtmr.h
parentMerge branch 'x86/vmware' into x86/trampoline (diff)
parentx86: Remove stale pmtimer_64.c (diff)
downloadkernel-qcow2-linux-d25e6b0b326278a1096e8334584c3e64517057a3.tar.gz
kernel-qcow2-linux-d25e6b0b326278a1096e8334584c3e64517057a3.tar.xz
kernel-qcow2-linux-d25e6b0b326278a1096e8334584c3e64517057a3.zip
Merge branch 'x86/cleanups' into x86/trampoline
Diffstat (limited to 'include/linux/acpi_pmtmr.h')
-rw-r--r--include/linux/acpi_pmtmr.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/acpi_pmtmr.h b/include/linux/acpi_pmtmr.h
index 7e3d2859be50..1d0ef1ae8036 100644
--- a/include/linux/acpi_pmtmr.h
+++ b/include/linux/acpi_pmtmr.h
@@ -25,8 +25,6 @@ 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)