|
|
cffab83 |
From: Josh Boyer <jwboyer@fedoraproject.org>
|
|
|
cffab83 |
Date: Mon, 28 Jul 2014 12:59:48 -0400
|
|
|
cffab83 |
Subject: [PATCH] Revert "Revert "ACPI / video: change acpi-video
|
|
|
cffab83 |
brightness_switch_enabled default to 0""
|
|
|
cffab83 |
|
|
|
cffab83 |
This reverts commit 2843768b701971ab10e62c77d5c75ad7c306f1bd.
|
|
|
6a91557 |
|
|
|
6a91557 |
Bugzilla: N/A
|
|
|
6a91557 |
Upstream-status: Sigh. We almost got to drop this.
|
|
|
6a91557 |
|
|
|
6a91557 |
Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
|
|
|
cffab83 |
---
|
|
|
cffab83 |
Documentation/kernel-parameters.txt | 2 +-
|
|
|
35eff41 |
drivers/acpi/acpi_video.c | 2 +-
|
|
|
cffab83 |
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
cffab83 |
|
|
|
cffab83 |
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
|
|
|
088a50c |
index 1d6f0459cd7b..ce09881b7c0a 100644
|
|
|
cffab83 |
--- a/Documentation/kernel-parameters.txt
|
|
|
cffab83 |
+++ b/Documentation/kernel-parameters.txt
|
|
|
088a50c |
@@ -3929,7 +3929,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
|
|
|
cffab83 |
the allocated input device; If set to 0, video driver
|
|
|
cffab83 |
will only send out the event without touching backlight
|
|
|
cffab83 |
brightness level.
|
|
|
cffab83 |
- default: 1
|
|
|
cffab83 |
+ default: 0
|
|
|
cffab83 |
|
|
|
cffab83 |
virtio_mmio.device=
|
|
|
cffab83 |
[VMMIO] Memory mapped virtio (platform) device.
|
|
|
35eff41 |
diff --git a/drivers/acpi/acpi_video.c b/drivers/acpi/acpi_video.c
|
|
|
35eff41 |
index 8c2fe2f2f9fd..6021e67be1f7 100644
|
|
|
35eff41 |
--- a/drivers/acpi/acpi_video.c
|
|
|
35eff41 |
+++ b/drivers/acpi/acpi_video.c
|
|
|
cffab83 |
@@ -68,7 +68,7 @@ MODULE_AUTHOR("Bruno Ducrot");
|
|
|
cffab83 |
MODULE_DESCRIPTION("ACPI Video Driver");
|
|
|
cffab83 |
MODULE_LICENSE("GPL");
|
|
|
cffab83 |
|
|
|
cffab83 |
-static bool brightness_switch_enabled = 1;
|
|
|
cffab83 |
+static bool brightness_switch_enabled;
|
|
|
cffab83 |
module_param(brightness_switch_enabled, bool, 0644);
|
|
|
cffab83 |
|
|
|
cffab83 |
/*
|