aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/acpi.h
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2009-07-06 23:42:10 -0400
committerLen Brown <len.brown@intel.com>2009-09-19 01:33:27 -0400
commite4f55966d02c5dfade2978c2aa05fb202a78a4d1 (patch)
tree1e7e150e615807f878686f8eb4a025f7b1391ef5 /include/linux/acpi.h
parenteb27cae8adaa658a0bf31631baa1ce29d8183759 (diff)
ACPI: remove unnecessary #ifdef CONFIG_DMI
acpi_osi_setup() does not depend on CONFIG_DMI acpi_dmi_osi_linux()'s definition doesn't depend on CONFIG_DMI either Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include/linux/acpi.h')
-rw-r--r--include/linux/acpi.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 7950c65c43af..9260408bf4ea 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -217,10 +217,8 @@ static inline int acpi_video_display_switch_support(void)
217#endif /* defined(CONFIG_ACPI_VIDEO) || defined(CONFIG_ACPI_VIDEO_MODULE) */ 217#endif /* defined(CONFIG_ACPI_VIDEO) || defined(CONFIG_ACPI_VIDEO_MODULE) */
218 218
219extern int acpi_blacklisted(void); 219extern int acpi_blacklisted(void);
220#ifdef CONFIG_DMI
221extern void acpi_dmi_osi_linux(int enable, const struct dmi_system_id *d); 220extern void acpi_dmi_osi_linux(int enable, const struct dmi_system_id *d);
222extern int acpi_osi_setup(char *str); 221extern int acpi_osi_setup(char *str);
223#endif
224 222
225#ifdef CONFIG_ACPI_NUMA 223#ifdef CONFIG_ACPI_NUMA
226int acpi_get_pxm(acpi_handle handle); 224int acpi_get_pxm(acpi_handle handle);