aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-x86_64
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2006-06-15 15:41:53 -0400
committerLen Brown <len.brown@intel.com>2006-06-15 15:41:53 -0400
commit3e8e7c93d7eb091463839b5212789c4aae09459e (patch)
tree697a04ce1202b8d8ff398b96944be844329b713c /include/asm-x86_64
parent36a557d1f48669c57f59e37d9334400a29e4e53c (diff)
parentffd642e748c867a7339b57225b8bf8b9a0dcd9c5 (diff)
Pull bugzilla-5653 into release branch
Diffstat (limited to 'include/asm-x86_64')
-rw-r--r--include/asm-x86_64/acpi.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-x86_64/acpi.h b/include/asm-x86_64/acpi.h
index aa1c7b2e438c..2c95a319c056 100644
--- a/include/asm-x86_64/acpi.h
+++ b/include/asm-x86_64/acpi.h
@@ -162,6 +162,8 @@ extern int acpi_pci_disabled;
162 162
163extern u8 x86_acpiid_to_apicid[]; 163extern u8 x86_acpiid_to_apicid[];
164 164
165#define ARCH_HAS_POWER_INIT 1
166
165extern int acpi_skip_timer_override; 167extern int acpi_skip_timer_override;
166 168
167#endif /*__KERNEL__*/ 169#endif /*__KERNEL__*/