diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-21 16:18:06 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-21 16:18:06 -0400 |
| commit | d60a2793ba562c6ea9bbf62112da3e6342adcf83 (patch) | |
| tree | 22a16cea2838fd473d03e8c6c64b93f0e3519f33 /arch/x86/include/asm/apb_timer.h | |
| parent | 781c5a67f152c17c3e4a9ed9647f8c0be6ea5ae9 (diff) | |
| parent | 40ffa93791985ab300fd488072e9f37ccf72e88c (diff) | |
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 'arch/x86/include/asm/apb_timer.h')
| -rw-r--r-- | arch/x86/include/asm/apb_timer.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/include/asm/apb_timer.h b/arch/x86/include/asm/apb_timer.h index a69b1ac9eaf8..2fefa501d3ba 100644 --- a/arch/x86/include/asm/apb_timer.h +++ b/arch/x86/include/asm/apb_timer.h | |||
| @@ -54,7 +54,6 @@ extern struct clock_event_device *global_clock_event; | |||
| 54 | extern unsigned long apbt_quick_calibrate(void); | 54 | extern unsigned long apbt_quick_calibrate(void); |
| 55 | extern int arch_setup_apbt_irqs(int irq, int trigger, int mask, int cpu); | 55 | extern int arch_setup_apbt_irqs(int irq, int trigger, int mask, int cpu); |
| 56 | extern void apbt_setup_secondary_clock(void); | 56 | extern void apbt_setup_secondary_clock(void); |
| 57 | extern unsigned int boot_cpu_id; | ||
| 58 | 57 | ||
| 59 | extern struct sfi_timer_table_entry *sfi_get_mtmr(int hint); | 58 | extern struct sfi_timer_table_entry *sfi_get_mtmr(int hint); |
| 60 | extern void sfi_free_mtmr(struct sfi_timer_table_entry *mtmr); | 59 | extern void sfi_free_mtmr(struct sfi_timer_table_entry *mtmr); |