From patchwork Wed May 12 22:33:57 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 99148 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4CMYBLd028357 for ; Wed, 12 May 2010 22:34:11 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758373Ab0ELWeJ (ORCPT ); Wed, 12 May 2010 18:34:09 -0400 Received: from smtp1.linux-foundation.org ([140.211.169.13]:34606 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758343Ab0ELWeI (ORCPT ); Wed, 12 May 2010 18:34:08 -0400 Received: from imap1.linux-foundation.org (imap1.linux-foundation.org [140.211.169.55]) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id o4CMXwap030896 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 12 May 2010 15:33:59 -0700 Received: from localhost.localdomain (localhost [127.0.0.1]) by imap1.linux-foundation.org (8.13.5.20060308/8.13.5/Debian-3ubuntu1.1) with ESMTP id o4CMXvi7024758; Wed, 12 May 2010 15:33:57 -0700 Message-Id: <201005122233.o4CMXvi7024758@imap1.linux-foundation.org> Subject: [patch for 2.6.34? 1/1] acpi: video: fix acpi_backlight=video To: lenb@kernel.org Cc: linux-acpi@vger.kernel.org, akpm@linux-foundation.org, kamal@canonical.com, bjorn.helgaas@hp.com, jkosina@suse.cz, rui.zhang@intel.com, stable@kernel.org From: akpm@linux-foundation.org Date: Wed, 12 May 2010 15:33:57 -0700 MIME-Version: 1.0 X-Spam-Status: No, hits=-3.501 required=5 tests=AWL, BAYES_00, OSDL_HEADER_SUBJECT_BRACKETED X-Spam-Checker-Version: SpamAssassin 3.2.4-osdl_revision__1.47__ X-MIMEDefang-Filter: lf$Revision: 1.188 $ X-Scanned-By: MIMEDefang 2.63 on 140.211.169.13 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Wed, 12 May 2010 22:34:11 +0000 (UTC) diff -puN drivers/acpi/video_detect.c~acpi-video-fix-acpi_backlight=video drivers/acpi/video_detect.c --- a/drivers/acpi/video_detect.c~acpi-video-fix-acpi_backlight=video +++ a/drivers/acpi/video_detect.c @@ -250,7 +250,7 @@ static int __init acpi_backlight(char *s 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; }