diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-21 20:18:06 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-21 20:18:06 (GMT) |
| commit | d60a2793ba562c6ea9bbf62112da3e6342adcf83 (patch) | |
| tree | 22a16cea2838fd473d03e8c6c64b93f0e3519f33 /include | |
| parent | 781c5a67f152c17c3e4a9ed9647f8c0be6ea5ae9 (diff) | |
| parent | 40ffa93791985ab300fd488072e9f37ccf72e88c (diff) | |
| download | linux-fsl-qoriq-d60a2793ba562c6ea9bbf62112da3e6342adcf83.tar.xz | |
Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: Remove stale pmtimer_64.c
x86, cleanups: Use clear_page/copy_page rather than memset/memcpy
x86: Remove unnecessary #ifdef ACPI/X86_IO_ACPI
x86, cleanup: Remove obsolete boot_cpu_id variable
Diffstat (limited to 'include')
| -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 7e3d285..1d0ef1a 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) |