projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Pull trivial into test branch
[linux-2.6-block.git]
/
include
/
asm-i386
/
acpi.h
diff --git
a/include/asm-i386/acpi.h
b/include/asm-i386/acpi.h
index 29bee1dcde7221f786a6ef443cdee6cbe7328add..7cfad93edf10085ae2b84e1a9700e1fcdba41ba1 100644
(file)
--- a/
include/asm-i386/acpi.h
+++ b/
include/asm-i386/acpi.h
@@
-110,6
+110,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; }