summaryrefslogtreecommitdiffstats
path: root/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-02-11 15:11:34 -0500
committerJosh Boyer <jwboyer@fedoraproject.org>2015-02-11 15:11:34 -0500
commit01bc4f68ee03f84d6cccbc5636842a3577b0c681 (patch)
tree6834813cb2cd618ee7b0746986ef10a7c84f0ac5 /Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch
parentd8308935db0f72734c51f6a1ec85ffa6ccffa6bc (diff)
downloadkernel-01bc4f68ee03f84d6cccbc5636842a3577b0c681.tar.gz
kernel-01bc4f68ee03f84d6cccbc5636842a3577b0c681.tar.xz
kernel-01bc4f68ee03f84d6cccbc5636842a3577b0c681.zip
Linux v3.19-2595-gc5ce28df0e7c
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 69971a3ae..c513e0631 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 176d4fe4f076..bd374bd2490b 100644
+index 512a35929f94..466b7e9758d0 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
-@@ -3793,7 +3793,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
+@@ -3808,7 +3808,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 176d4fe4f076..bd374bd2490b 100644
virtio_mmio.device=
[VMMIO] Memory mapped virtio (platform) device.
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
-index 032db459370f..5b9c0bae4503 100644
+index 88a4f99dd2a7..570920c08a51 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -68,7 +68,7 @@ MODULE_AUTHOR("Bruno Ducrot");