summaryrefslogtreecommitdiff
path: root/include/linux/acpi.h
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2015-06-16 16:27:45 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-06-19 01:10:26 +0200
commitadc8bb8e0fe005ed29366e6c4621652481878214 (patch)
tree7bd8a4bd76676768a2c195a864d3afc30db6e543 /include/linux/acpi.h
parentfb105d964226ce4834b45d7e3d9f339aa716ed70 (diff)
acpi-video-detect: Move acpi_is_video_device() to acpi/scan.c
This allows video_detect.c to be build as a module, this is a preparation patch for the backlight interface selection logic cleanup. Note this commit also causes acpi_is_video_device() to always be build indepedent of CONFIG_ACPI_VIDEO, as there is no reason to make its building depend on CONFIG_ACPI_VIDEO. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Darren Hart <dvhart@linux.intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'include/linux/acpi.h')
-rw-r--r--include/linux/acpi.h8
1 files changed, 2 insertions, 6 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 88c92a03a77e..7cb3b0bc4a7e 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -243,19 +243,15 @@ extern bool wmi_has_guid(const char *guid);
#define ACPI_VIDEO_OUTPUT_SWITCHING_DMI_VENDOR 0x0400
#define ACPI_VIDEO_OUTPUT_SWITCHING_DMI_VIDEO 0x0800
+extern long acpi_is_video_device(acpi_handle handle);
+
#if defined(CONFIG_ACPI_VIDEO) || defined(CONFIG_ACPI_VIDEO_MODULE)
-extern long acpi_is_video_device(acpi_handle handle);
extern void acpi_video_dmi_promote_vendor(void);
extern int acpi_video_backlight_support(void);
#else
-static inline long acpi_is_video_device(acpi_handle handle)
-{
- return 0;
-}
-
static inline void acpi_video_dmi_promote_vendor(void)
{
}