ACPI: Fix some compilation issues

diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c
index ced5f2aed562153f10d17def183475ea73fcf59b..4c6e991acf67ecc2bedd04ba47a78d22b8b78377 100644 (file)
--- a/drivers/acpi/sleep/main.c
+++ b/drivers/acpi/sleep/main.c
@@ -13,6 +13,7 @@
 #include <linux/device.h>
 #include <linux/suspend.h>
 #include <acpi/acpi_bus.h>
+#include <acpi/acpi_drivers.h>
 #include "sleep.h"
 
 #define _COMPONENT             ACPI_SYSTEM_COMPONENT

diff --git a/drivers/acpi/sleep/proc.c b/drivers/acpi/sleep/proc.c
index 1d5375b8a32383f060a88dbb996e80b6e34d80b2..687d002187d36f349b941441b167acfd8a30e3d5 100644 (file)
--- a/drivers/acpi/sleep/proc.c
+++ b/drivers/acpi/sleep/proc.c
@@ -5,6 +5,7 @@
 #include <asm/uaccess.h>
 
 #include <acpi/acpi_bus.h>
+#include <acpi/acpi_drivers.h>
 
 #ifdef CONFIG_X86
 #include <linux/mc146818rtc.h>

diff --git a/drivers/acpi/toshiba_acpi.c b/drivers/acpi/toshiba_acpi.c
index 1699509e0531dab3825140adc4ff163c668916f1..d4a90b26d1690273ad81f2e4d676873918bbf4ab 100644 (file)
--- a/drivers/acpi/toshiba_acpi.c
+++ b/drivers/acpi/toshiba_acpi.c
@@ -44,7 +44,7 @@
 #include <linux/seq_file.h>
 #include <linux/version.h>
 
-#include <acconfig.h>
+#include <acpi/acconfig.h>
 #define OLD_ACPI_INTERFACE (ACPI_CA_VERSION < 0x20020000)
 
 #if OLD_ACPI_INTERFACE

diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h
index ae866fa469cc055f97a48f5f15cac54a4578d58a..33409830eb75e589e27610567f04c24733c3c30a 100644 (file)
--- a/include/acpi/platform/aclinux.h
+++ b/include/acpi/platform/aclinux.h
@@ -28,6 +28,7 @@
 #define ACPI_OS_NAME                "Linux"
 
 #define ACPI_USE_SYSTEM_CLIBRARY
+#define ACPI_USE_DO_WHILE_0
 
 #ifdef __KERNEL__