---

yaml --- r: 165288 b: refs/heads/master c: e4f5596 h: refs/heads/master v: v3
git-mirror · Sep 19, 2009 · f082d35 · f082d35
1 parent 6f02c78
commit f082d35
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git 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
@@ -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);