aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJesse Barnes <jbarnes@engr.sgi.com>2004-08-21 22:30:28 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-08-21 22:30:28 -0700
commit59ee499daba6b8f6ca68acab369fb326bef1a54e (patch)
tree52e6d3bd1a774ae460d1c7bb007a093ece5e2ad3 /include
parent5ce15909cd8872b6e9e9d2f59710ef7646b196f0 (diff)
downloadhistory-59ee499daba6b8f6ca68acab369fb326bef1a54e.tar.gz
[PATCH] ACPI for 2.6
Define acpi_noirq on ia64 since it's used now in pci_link.c. All ia64 machines use ACPI, so we can just define it to 0 like we do for acpi_disabled and acpi_pci_disabled. Signed-off-by: Jesse Barnes <jbarnes@sgi.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
-rw-r--r--include/asm-ia64/acpi.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-ia64/acpi.h b/include/asm-ia64/acpi.h
index 1ebe9a5912272c..5a6372756cecba 100644
--- a/include/asm-ia64/acpi.h
+++ b/include/asm-ia64/acpi.h
@@ -89,6 +89,7 @@ ia64_acpi_release_global_lock (unsigned int *lock)
((Acq) = ia64_acpi_release_global_lock((unsigned int *) GLptr))
#define acpi_disabled 0 /* ACPI always enabled on IA64 */
+#define acpi_noirq 0 /* ACPI always enabled on IA64 */
#define acpi_pci_disabled 0 /* ACPI PCI always enabled on IA64 */
#define acpi_strict 1 /* no ACPI spec workarounds on IA64 */
static inline void disable_acpi(void) { }