diff options
| author | Kamal Mostafa <kamal@canonical.com> | 2010-05-01 12:09:49 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-07-05 11:15:35 -0700 |
| commit | 3248102fb17e21a7cdf73e4a9a55044b8affe286 (patch) | |
| tree | ffa0026a451f2b5ff8b7e41403fb07489eb983b7 /drivers | |
| parent | a86e8a1426783b1ce690c3c9f57bf4999f3d96d2 (diff) | |
| download | kernel-crypto-3248102fb17e21a7cdf73e4a9a55044b8affe286.tar.gz kernel-crypto-3248102fb17e21a7cdf73e4a9a55044b8affe286.tar.xz kernel-crypto-3248102fb17e21a7cdf73e4a9a55044b8affe286.zip | |
ACPI: video: fix acpi_backlight=video
commit eeb4bcb4771679d7b3446c0293334faee11b090a upstream.
Make "acpi_backlight=video" param enable ACPI_VIDEO_BACKLIGHT_FORCE_VIDEO
as intended, instead of incorrectly enabling video output switching.
BugLink: http://bugs.launchpad.net/bugs/573120
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Acked-by: Zhang Rui <rui.zhang@intel.com>
Cc: Bjorn Helgaas <bjorn.helgaas@hp.com>
Cc: Jiri Kosina <jkosina@suse.cz>
Acked-by: Thomas Renninger <trenn@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Len Brown <len.brown@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/acpi/video_detect.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/video_detect.c b/drivers/acpi/video_detect.c index fc2f26b9b40..c5fef01b3c9 100644 --- a/drivers/acpi/video_detect.c +++ b/drivers/acpi/video_detect.c @@ -250,7 +250,7 @@ static int __init acpi_backlight(char *str) ACPI_VIDEO_BACKLIGHT_FORCE_VENDOR; if (!strcmp("video", str)) acpi_video_support |= - ACPI_VIDEO_OUTPUT_SWITCHING_FORCE_VIDEO; + ACPI_VIDEO_BACKLIGHT_FORCE_VIDEO; } return 1; } |