diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-11-14 15:23:17 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-11-14 15:23:17 -0800 |
| commit | f5ad1a785f7fb9e6f65ba437ba0a64cad4e97dae (patch) | |
| tree | ce707640cf9844607b68d81227d2f57ff2e163ad /include/asm-i386/acpi.h | |
| parent | 9a3a04ac386f44175b6a4142eaeab3d4170a57f3 (diff) | |
| parent | 9446868b5383eb87f76b2d4389dea4bb968a6657 (diff) | |
| download | op-kernel-dev-f5ad1a785f7fb9e6f65ba437ba0a64cad4e97dae.zip op-kernel-dev-f5ad1a785f7fb9e6f65ba437ba0a64cad4e97dae.tar.gz | |
Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6
* 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6:
[PATCH] x86-64: Fix race in exit_idle
[PATCH] x86-64: Fix vgetcpu when CONFIG_HOTPLUG_CPU is disabled
[PATCH] x86: Add acpi_user_timer_override option for Asus boards
[PATCH] x86-64: setup saved_max_pfn correctly (kdump)
[PATCH] x86-64: Handle reserve_bootmem_generic beyond end_pfn
[PATCH] x86-64: shorten the x86_64 boot setup GDT to what the comment says
[PATCH] x86-64: Fix PTRACE_[SG]ET_THREAD_AREA regression with ia32 emulation.
[PATCH] x86-64: Fix partial page check to ensure unusable memory is not being marked usable.
Revert "[PATCH] MMCONFIG and new Intel motherboards"
Diffstat (limited to 'include/asm-i386/acpi.h')
| -rw-r--r-- | include/asm-i386/acpi.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-i386/acpi.h b/include/asm-i386/acpi.h index 6016632..c80b3a9 100644 --- a/include/asm-i386/acpi.h +++ b/include/asm-i386/acpi.h @@ -132,6 +132,7 @@ extern int acpi_gsi_to_irq(u32 gsi, unsigned int *irq); #ifdef CONFIG_X86_IO_APIC extern int acpi_skip_timer_override; +extern int acpi_use_timer_override; #endif static inline void acpi_noirq_set(void) { acpi_noirq = 1; } |
