diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-06-03 23:12:37 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-06-03 23:12:37 +0200 |
| commit | d9bd44933cb21faf2cfe09798c1a2c95563a0bcb (patch) | |
| tree | f16d3375cd246e2740651ffcf6cd8dbc30f2e0b4 /include/acpi | |
| parent | 0e36d43c9c87554cdb18aa865eec9edccda17324 (diff) | |
| parent | 0dc6b96ac20c538a28bd8442ae74b87fc6b6f6e0 (diff) | |
| download | lwn-d9bd44933cb21faf2cfe09798c1a2c95563a0bcb.tar.gz lwn-d9bd44933cb21faf2cfe09798c1a2c95563a0bcb.zip | |
Merge branch 'acpi-video'
* acpi-video:
ACPI / video: Add 4 new models to the use_native_backlight DMI list
ACPI / video: Add use native backlight quirk for the ThinkPad W530
ACPI / video: Unregister the backlight device if a raw one shows up later
backlight: Add backlight device (un)registration notification
nouveau: Don't check acpi_video_backlight_support() before registering backlight
acer-wmi: Add Aspire 5741 to video_vendor_dmi_table
acer-wmi: Switch to acpi_video_unregister_backlight
ACPI / video: Add an acpi_video_unregister_backlight function
ACPI / video: Don't register acpi_video_resume notifier without backlight devices
ACPI / video: change acpi-video brightness_switch_enabled default to 0
Diffstat (limited to 'include/acpi')
| -rw-r--r-- | include/acpi/video.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/acpi/video.h b/include/acpi/video.h index 61109f2609fc..ea4c7bbded4d 100644 --- a/include/acpi/video.h +++ b/include/acpi/video.h @@ -19,11 +19,13 @@ struct acpi_device; #if (defined CONFIG_ACPI_VIDEO || defined CONFIG_ACPI_VIDEO_MODULE) extern int acpi_video_register(void); extern void acpi_video_unregister(void); +extern void acpi_video_unregister_backlight(void); extern int acpi_video_get_edid(struct acpi_device *device, int type, int device_id, void **edid); #else static inline int acpi_video_register(void) { return 0; } static inline void acpi_video_unregister(void) { return; } +static inline void acpi_video_unregister_backlight(void) { return; } static inline int acpi_video_get_edid(struct acpi_device *device, int type, int device_id, void **edid) { |