summaryrefslogtreecommitdiffstats
path: root/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-04-15 10:47:18 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2015-04-15 10:47:18 -0400
commitcc7213fcfe3019d0f935cd14e9b64c0d77bd25f4 (patch)
treedf0a7fd10cc86eaf4e3eca0ceab421e9e21fb2a0 /Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch
parentb18e6e75364d806d76d99333646943f6765095fb (diff)
downloadkernel-cc7213fcfe3019d0f935cd14e9b64c0d77bd25f4.tar.gz
kernel-cc7213fcfe3019d0f935cd14e9b64c0d77bd25f4.tar.xz
kernel-cc7213fcfe3019d0f935cd14e9b64c0d77bd25f4.zip
Linux v4.0-3843-gbb0fd7ab0986
Diffstat (limited to 'Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch')
-rw-r--r--Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch b/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch
index 2ac273199..b4f8cee39 100644
--- a/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch
+++ b/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch
@@ -15,10 +15,10 @@ Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
-index 01aa47d3b6ab..e9b48474301b 100644
+index 491bbd104b06..b8c814f44437 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
-@@ -3823,7 +3823,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
+@@ -3844,7 +3844,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
the allocated input device; If set to 0, video driver
will only send out the event without touching backlight
brightness level.
@@ -28,7 +28,7 @@ index 01aa47d3b6ab..e9b48474301b 100644
virtio_mmio.device=
[VMMIO] Memory mapped virtio (platform) device.
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
-index 26eb70c8f518..db70d550f526 100644
+index cc79d3fedfb2..d9bf8ba7d848 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -68,7 +68,7 @@ MODULE_AUTHOR("Bruno Ducrot");