diff --git a/[refs] b/[refs]
index 2c3a97d19109..cc404aa14e5e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 74262de5d15fe0cab9e6fe75655a502d3c90acca
+refs/heads/master: 3f5948fa2cbbda1261eec9a39ef3004b3caf73fb
diff --git a/trunk/include/linux/acpi.h b/trunk/include/linux/acpi.h
index d5a55bdb9c3c..b123cc08773d 100644
--- a/trunk/include/linux/acpi.h
+++ b/trunk/include/linux/acpi.h
@@ -25,6 +25,8 @@
 #ifndef _LINUX_ACPI_H
 #define _LINUX_ACPI_H
 
+#include <linux/config.h>
+
 #ifdef	CONFIG_ACPI
 
 #ifndef _LINUX