diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-11-22 13:06:44 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-11-22 13:06:44 -0500 |
| commit | 0bd2af46839ad6262d25714a6ec0365db9d6b98f (patch) | |
| tree | dcced72d230d69fd0c5816ac6dd03ab84799a93e /include/asm-x86_64/acpi.h | |
| parent | e138a5d2356729b8752e88520cc1525fae9794ac (diff) | |
| parent | f26b90440cd74c78fe10c9bd5160809704a9627c (diff) | |
Merge ../scsi-rc-fixes-2.6
Diffstat (limited to 'include/asm-x86_64/acpi.h')
| -rw-r--r-- | include/asm-x86_64/acpi.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-x86_64/acpi.h b/include/asm-x86_64/acpi.h index ed59aa4c6ff9..9d1916e59c04 100644 --- a/include/asm-x86_64/acpi.h +++ b/include/asm-x86_64/acpi.h | |||
| @@ -163,6 +163,7 @@ extern u8 x86_acpiid_to_apicid[]; | |||
| 163 | #define ARCH_HAS_POWER_INIT 1 | 163 | #define ARCH_HAS_POWER_INIT 1 |
| 164 | 164 | ||
| 165 | extern int acpi_skip_timer_override; | 165 | extern int acpi_skip_timer_override; |
| 166 | extern int acpi_use_timer_override; | ||
| 166 | 167 | ||
| 167 | #endif /*__KERNEL__*/ | 168 | #endif /*__KERNEL__*/ |
| 168 | 169 | ||