diff mbox

[1/2] : ACPI: Check whether the acpi video is deferrable only when KMS is enabled

Message ID 1239678345.5564.69.camel@localhost.localdomain (mailing list archive)
State Not Applicable, archived
Headers show

Commit Message

Zhao, Yakui April 14, 2009, 3:05 a.m. UTC 
From: Zhao Yakui <yakui.zhao@intel.com>

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 <yakui.zhao@intel.com>
cc: Matthew Garrett <mjg59@srcf.ucam.org>
---
 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

Comments

Matthew Garrett April 14, 2009, 7:36 p.m. UTC | #1 
On Tue, Apr 14, 2009 at 11:05:45AM +0800, yakui_zhao wrote:
> From: Zhao Yakui <yakui.zhao@intel.com>
> 
> 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 <yakui.zhao@intel.com>
> cc: Matthew Garrett <mjg59@srcf.ucam.org>

Acked-by: Matthew Garrett <mjg@redhat.com>
diff mbox

Patch

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;