summaryrefslogtreecommitdiffstats
path: root/include/linux/acpi.h
diff options
context:
space:
mode:
authorLen Brown2005-05-27 10:21:50 +0200
committerLinus Torvalds2005-05-27 17:15:04 +0200
commit25be5e6ccc5c9cab77012fabbb72520f9b6e4618 (patch)
tree4c1b48179d7f18b3e037a473d8e04708b619ac5c /include/linux/acpi.h
parent[PATCH] cpuset exit NULL dereference fix (diff)
downloadkernel-qcow2-linux-25be5e6ccc5c9cab77012fabbb72520f9b6e4618.tar.gz
kernel-qcow2-linux-25be5e6ccc5c9cab77012fabbb72520f9b6e4618.tar.xz
kernel-qcow2-linux-25be5e6ccc5c9cab77012fabbb72520f9b6e4618.zip
[PATCH] VIA IRQ quirk
Delete quirk_via_bridge(), restore quirk_via_irqpic() -- but now improved to be invoked upon device ENABLE, and now only for VIA devices -- not all devices behind VIA bridges. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Len Brown <len.brown@intel.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux/acpi.h')
-rw-r--r--include/linux/acpi.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index aefe6d051ace..d5a55bdb9c3c 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -25,6 +25,8 @@
#ifndef _LINUX_ACPI_H
#define _LINUX_ACPI_H
+#ifdef CONFIG_ACPI
+
#ifndef _LINUX
#define _LINUX
#endif
@@ -533,4 +535,5 @@ static inline int acpi_get_pxm(acpi_handle handle)
extern int pnpacpi_disabled;
-#endif /*_LINUX_ACPI_H*/
+#endif /* CONFIG_ACPI */
+#endif /*_LINUX_ACPI_H*/