diff --git a/[refs] b/[refs]
index 893667c25482..6fcd9eff85c9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eb27cae8adaa658a0bf31631baa1ce29d8183759
+refs/heads/master: e4f55966d02c5dfade2978c2aa05fb202a78a4d1
diff --git a/trunk/include/linux/acpi.h b/trunk/include/linux/acpi.h
index 7950c65c43af..9260408bf4ea 100644
--- a/trunk/include/linux/acpi.h
+++ b/trunk/include/linux/acpi.h
@@ -217,10 +217,8 @@ static inline int acpi_video_display_switch_support(void)
 #endif /* defined(CONFIG_ACPI_VIDEO) || defined(CONFIG_ACPI_VIDEO_MODULE) */
 
 extern int acpi_blacklisted(void);
-#ifdef CONFIG_DMI
 extern void acpi_dmi_osi_linux(int enable, const struct dmi_system_id *d);
 extern int acpi_osi_setup(char *str);
-#endif
 
 #ifdef CONFIG_ACPI_NUMA
 int acpi_get_pxm(acpi_handle handle);