summaryrefslogtreecommitdiffstats
path: root/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-06-26 09:33:38 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2015-06-26 09:33:38 -0400
commit35eff41288ccf2a1ddd555db0b0e51906af970a0 (patch)
tree761d7f671ba27b4a314aa72a864f9a3a56dc7d5b /Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch
parent21694f1b769f352163ed762b519cc7155dd1c97d (diff)
downloadkernel-35eff41288ccf2a1ddd555db0b0e51906af970a0.tar.gz
kernel-35eff41288ccf2a1ddd555db0b0e51906af970a0.tar.xz
kernel-35eff41288ccf2a1ddd555db0b0e51906af970a0.zip
Linux v4.1-5596-gaefbef10e3ae
Diffstat (limited to 'Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch')
-rw-r--r--Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch14
1 files changed, 7 insertions, 7 deletions
diff --git a/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch b/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch
index 5d1f378bc..f7eb3d759 100644
--- a/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch
+++ b/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch
@@ -11,14 +11,14 @@ Upstream-status: Sigh. We almost got to drop this.
Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
---
Documentation/kernel-parameters.txt | 2 +-
- drivers/acpi/video.c | 2 +-
+ drivers/acpi/acpi_video.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
-index 6726139bd289..a5e55141ae64 100644
+index fd66d220c115..d5be5fb06be0 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
-@@ -3871,7 +3871,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
+@@ -3909,7 +3909,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.
@@ -27,10 +27,10 @@ index 6726139bd289..a5e55141ae64 100644
virtio_mmio.device=
[VMMIO] Memory mapped virtio (platform) device.
-diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
-index cc79d3fedfb2..d9bf8ba7d848 100644
---- a/drivers/acpi/video.c
-+++ b/drivers/acpi/video.c
+diff --git a/drivers/acpi/acpi_video.c b/drivers/acpi/acpi_video.c
+index 8c2fe2f2f9fd..6021e67be1f7 100644
+--- a/drivers/acpi/acpi_video.c
++++ b/drivers/acpi/acpi_video.c
@@ -68,7 +68,7 @@ MODULE_AUTHOR("Bruno Ducrot");
MODULE_DESCRIPTION("ACPI Video Driver");
MODULE_LICENSE("GPL");