Merge branch 'for-jens' of git://git.drbd.org/linux-2.6-drbd into for-linus

[pandora-kernel.git] / include / acpi / reboot.h

diff --git a/include/acpi/reboot.h b/include/acpi/reboot.h
index 8857f57..0419184 100644 (file)
--- 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