From patchwork Tue Apr 14 03:05:45 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhao, Yakui" X-Patchwork-Id: 18011 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n3E34SpK015588 for ; Tue, 14 Apr 2009 03:04:28 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752521AbZDNDEZ (ORCPT ); Mon, 13 Apr 2009 23:04:25 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752434AbZDNDEZ (ORCPT ); Mon, 13 Apr 2009 23:04:25 -0400 Received: from mga02.intel.com ([134.134.136.20]:38979 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752433AbZDNDEY (ORCPT ); Mon, 13 Apr 2009 23:04:24 -0400 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP; 13 Apr 2009 19:56:33 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.40,182,1239001200"; d="scan'208";a="402884751" Received: from yakui_zhao.sh.intel.com (HELO [10.239.36.130]) ([10.239.36.130]) by orsmga002.jf.intel.com with ESMTP; 13 Apr 2009 20:12:30 -0700 Subject: [PATCH 1/2]: ACPI: Check whether the acpi video is deferrable only when KMS is enabled From: yakui_zhao To: lenb@kernel.org Cc: linux-acpi@vger.kernel.org Organization: Intel Open Source Technology Center Date: Tue, 14 Apr 2009 11:05:45 +0800 Message-Id: <1239678345.5564.69.camel@localhost.localdomain> Mime-Version: 1.0 X-Mailer: Evolution 2.22.1 (2.22.1-2.fc9) Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org From: Zhao Yakui weaken the dependency between the I915 driver and ACPI video driver. When the KMS is not enabled in kernel configuration, it will contine the current flowchart. Signed-off-by: Zhao Yakui cc: Matthew Garrett Acked-by: Matthew Garrett --- drivers/acpi/video.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: linux-2.6/drivers/acpi/video.c =================================================================== --- linux-2.6.orig/drivers/acpi/video.c 2009-04-14 10:26:30.000000000 +0800 +++ linux-2.6/drivers/acpi/video.c 2009-04-14 10:28:12.000000000 +0800 @@ -2242,7 +2242,7 @@ static int __init intel_opregion_present(void) { -#if defined(CONFIG_DRM_I915) || defined(CONFIG_DRM_I915_MODULE) +#if defined(CONFIG_DRM_I915_KMS) struct pci_dev *dev = NULL; u32 address;