diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-06-03 17:12:37 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-06-03 17:12:37 -0400 |
| commit | d9bd44933cb21faf2cfe09798c1a2c95563a0bcb (patch) | |
| tree | f16d3375cd246e2740651ffcf6cd8dbc30f2e0b4 /Documentation/kernel-parameters.txt | |
| parent | 0e36d43c9c87554cdb18aa865eec9edccda17324 (diff) | |
| parent | 0dc6b96ac20c538a28bd8442ae74b87fc6b6f6e0 (diff) | |
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 'Documentation/kernel-parameters.txt')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index c6e72ee53903..0933ec4924d3 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
| @@ -3481,7 +3481,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. | |||
| 3481 | the allocated input device; If set to 0, video driver | 3481 | the allocated input device; If set to 0, video driver |
| 3482 | will only send out the event without touching backlight | 3482 | will only send out the event without touching backlight |
| 3483 | brightness level. | 3483 | brightness level. |
| 3484 | default: 1 | 3484 | default: 0 |
| 3485 | 3485 | ||
| 3486 | virtio_mmio.device= | 3486 | virtio_mmio.device= |
| 3487 | [VMMIO] Memory mapped virtio (platform) device. | 3487 | [VMMIO] Memory mapped virtio (platform) device. |