summaryrefslogtreecommitdiffstats
path: root/include/acpi
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-01-12 01:09:27 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-01-12 01:09:27 +0100
commitb12745cce2c903ff8e84ebbd1f8632063156d194 (patch)
treef17873fe6c0ca446de56c9d2cc260c60b02aabd1 /include/acpi
parentf3a1bca09a1f4ac445434b97ed2a43e5c6449cf4 (diff)
parentaecbd9b1bff6afbe349921b406b99d285b412820 (diff)
downloadlinux-stable-b12745cce2c903ff8e84ebbd1f8632063156d194.tar.gz
linux-stable-b12745cce2c903ff8e84ebbd1f8632063156d194.tar.bz2
linux-stable-b12745cce2c903ff8e84ebbd1f8632063156d194.zip
Merge branch 'acpi-video'
* acpi-video: ACPI / video: driver must be registered before checking for keypresses ACPI / video: Add a quirk to force acpi-video backlight on SAMSUNG 530U4E/540U4E ACPI / video: Add quirks for the Dell Vostro V131 ACPI / video: Add a module option to disable the reporting of keypresses thinkpad_acpi: Use acpi_video_handles_brightness_key_presses() dell-wmi: Use acpi_video_handles_brightness_key_presses() ACPI / video: Add a acpi_video_handles_brightness_key_presses() helper
Diffstat (limited to 'include/acpi')
-rw-r--r--include/acpi/video.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/acpi/video.h b/include/acpi/video.h
index c62392d9b52a..f11d342b4567 100644
--- a/include/acpi/video.h
+++ b/include/acpi/video.h
@@ -2,6 +2,7 @@
#define __ACPI_VIDEO_H
#include <linux/errno.h> /* for ENODEV */
+#include <linux/types.h> /* for bool */
struct acpi_device;
@@ -31,6 +32,7 @@ extern int acpi_video_get_edid(struct acpi_device *device, int type,
int device_id, void **edid);
extern enum acpi_backlight_type acpi_video_get_backlight_type(void);
extern void acpi_video_set_dmi_backlight_type(enum acpi_backlight_type type);
+extern bool acpi_video_handles_brightness_key_presses(void);
#else
static inline int acpi_video_register(void) { return 0; }
static inline void acpi_video_unregister(void) { return; }
@@ -46,6 +48,10 @@ static inline enum acpi_backlight_type acpi_video_get_backlight_type(void)
static inline void acpi_video_set_dmi_backlight_type(enum acpi_backlight_type type)
{
}
+static inline bool acpi_video_handles_brightness_key_presses(void)
+{
+ return false;
+}
#endif
#endif