summaryrefslogtreecommitdiff
path: root/include/acpi
diff options
context:
space:
mode:
authorAaron Durbin <adurbin@google.com>2008-07-16 23:27:08 +0200
committerAndi Kleen <andi@basil.nowhere.org>2008-07-16 23:27:08 +0200
commit4d3870431d17346c4fdd80e087b7d76f1b5941d5 (patch)
treea8d3dcc5ab984ed7cbf67965372d58145bc90e9a /include/acpi
parentc83642d5123225a22cccd75adea6e97c245714cb (diff)
Add the ability to reset the machine using the RESET_REG in ACPI's FADT table.
Signed-off-by: Aaron Durbin <adurbin@google.com> Signed-off-by: Andi Kleen <ak@linux.intel.com> Cc: Len Brown <lenb@kernel.org> Cc: Andi Kleen <andi@firstfloor.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'include/acpi')
-rw-r--r--include/acpi/reboot.h14
1 files changed, 8 insertions, 6 deletions
diff --git a/include/acpi/reboot.h b/include/acpi/reboot.h
index 8857f57e0b7..0419184ce88 100644
--- a/include/acpi/reboot.h
+++ b/include/acpi/reboot.h
@@ -1,9 +1,11 @@
+#ifndef __ACPI_REBOOT_H
+#define __ACPI_REBOOT_H
+
+#ifdef CONFIG_ACPI
+extern void acpi_reboot(void);
+#else
+static inline void acpi_reboot(void) { }
+#endif
-/*
- * Dummy placeholder to make the EFI patches apply to the x86 tree.
- * Andrew/Len, please just kill this file if you encounter it.
- */
-#ifndef acpi_reboot
-# define acpi_reboot() do { } while (0)
#endif