diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-07-29 11:24:48 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-07-29 11:24:51 -0400 |
| commit | 7031fc6322284526674d7e513ab2f4f33ebc8c6f (patch) | |
| tree | ad30b21eb7d633fcc63ce32343b1708715eca131 | |
| parent | d2354f0ec050c564f9be68731555d0db04b14349 (diff) | |
| download | kernel-7031fc6322284526674d7e513ab2f4f33ebc8c6f.tar.gz kernel-7031fc6322284526674d7e513ab2f4f33ebc8c6f.tar.xz kernel-7031fc6322284526674d7e513ab2f4f33ebc8c6f.zip | |
Drop acpi_brightness_enable revert patch
https://lists.fedoraproject.org/pipermail/kernel/2015-July/005958.html
| -rw-r--r-- | Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch | 42 | ||||
| -rw-r--r-- | kernel.spec | 5 |
2 files changed, 3 insertions, 44 deletions
diff --git a/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch b/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch deleted file mode 100644 index 24ad74bcb..000000000 --- a/Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch +++ /dev/null @@ -1,42 +0,0 @@ -From: Josh Boyer <jwboyer@fedoraproject.org> -Date: Mon, 28 Jul 2014 12:59:48 -0400 -Subject: [PATCH] Revert "Revert "ACPI / video: change acpi-video - brightness_switch_enabled default to 0"" - -This reverts commit 2843768b701971ab10e62c77d5c75ad7c306f1bd. - -Bugzilla: N/A -Upstream-status: Sigh. We almost got to drop this. - -Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org> ---- - Documentation/kernel-parameters.txt | 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 1d6f0459cd7b..ce09881b7c0a 100644 ---- a/Documentation/kernel-parameters.txt -+++ b/Documentation/kernel-parameters.txt -@@ -3929,7 +3929,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. -- default: 1 -+ default: 0 - - virtio_mmio.device= - [VMMIO] Memory mapped virtio (platform) device. -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"); - --static bool brightness_switch_enabled = 1; -+static bool brightness_switch_enabled; - module_param(brightness_switch_enabled, bool, 0644); - - /* diff --git a/kernel.spec b/kernel.spec index 3e4e14223..97dc4b588 100644 --- a/kernel.spec +++ b/kernel.spec @@ -506,8 +506,6 @@ Patch457: ARM-tegra-usb-no-reset.patch Patch463: arm-i.MX6-Utilite-device-dtb.patch -Patch465: Revert-Revert-ACPI-video-change-acpi-video-brightnes.patch - Patch466: input-kill-stupid-messages.patch Patch467: die-floppy-die.patch @@ -2023,6 +2021,9 @@ fi # # %changelog +* Wed Jul 29 2015 Josh Boyer <jwboyer@fedoraproject.org> +- Drop acpi_brightness_enable revert patch + * Tue Jul 28 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.2.0-0.rc4.git1.1 - Linux v4.2-rc4-44-g67eb890e5e13 - Reenable debugging options. |