diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2010-10-21 01:22:45 +0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2010-10-21 01:22:45 +0400 |
| commit | d25e6b0b326278a1096e8334584c3e64517057a3 (patch) | |
| tree | 3c914b877adf9615c7158b58705478e56c9b4247 /include/linux | |
| parent | e44dea35ccb78ab7dc3a75ccec71d7d6f35017c4 (diff) | |
| parent | 40ffa93791985ab300fd488072e9f37ccf72e88c (diff) | |
| download | linux-d25e6b0b326278a1096e8334584c3e64517057a3.tar.xz | |
Merge branch 'x86/cleanups' into x86/trampoline
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/acpi_pmtmr.h | 2 |
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) |