[gentoo-commits] linux-patches r1713 - genpatches-2.6/trunk/2.6.34

[Mike Pagano (mpagano)]

Author: mpagano
Date: 2010-06-03 20:05:53 +0000 (Thu, 03 Jun 2010)
New Revision: 1713

Added:
   genpatches-2.6/trunk/2.6.34/2700_nouveau-acpi-lid-open-undefined-fix.patch
Modified:
   genpatches-2.6/trunk/2.6.34/0000_README
Log:
Fix for acpi_lid_open undefined error in nouveau driver

Modified: genpatches-2.6/trunk/2.6.34/0000_README
===================================================================
--- genpatches-2.6/trunk/2.6.34/0000_README	2010-06-02 20:44:43 UTC (rev 1712)
+++ genpatches-2.6/trunk/2.6.34/0000_README	2010-06-03 20:05:53 UTC (rev 1713)
@@ -39,6 +39,10 @@
 Individual Patch Descriptions:
 --------------------------------------------------------------------------
 
+Patch:	2700_nouveau-acpi-lid-open-undefined-fix.patch
+From:	http://bugs.gentoo.org/show_bug.cgi?id=322001
+Desc:	nouveau: fix acpi_lid_open undefined
+
 Patch:	2900_xconfig-with-qt4.patch
 From:	http://bugs.gentoo.org/show_bug.cgi?id=320761
 Desc:	xconfig patch for qt4 - thanks to Sam Iam

Added: genpatches-2.6/trunk/2.6.34/2700_nouveau-acpi-lid-open-undefined-fix.patch
===================================================================
--- genpatches-2.6/trunk/2.6.34/2700_nouveau-acpi-lid-open-undefined-fix.patch	                        (rev 0)
+++ genpatches-2.6/trunk/2.6.34/2700_nouveau-acpi-lid-open-undefined-fix.patch	2010-06-03 20:05:53 UTC (rev 1713)
@@ -0,0 +1,12 @@
+--- a/drivers/gpu/drm/nouveau/nouveau_connector.c	2010-06-03 15:39:37.000000000 -0400
++++ b/drivers/gpu/drm/nouveau/nouveau_connector.c	2010-06-03 15:41:29.000000000 -0400
+@@ -241,7 +241,8 @@ nouveau_connector_detect(struct drm_conn
+ 	if (nv_encoder && nv_connector->native_mode) {
+ 		unsigned status = connector_status_connected;
+ 
+-#ifdef CONFIG_ACPI
++#if defined(CONFIG_ACPI_BUTTON) || \
++    (defined(CONFIG_ACPI_BUTTON_MODULE) && defined(MODULE))
+ 		if (!nouveau_ignorelid && !acpi_lid_open())
+ 			status = connector_status_unknown;
+ #endif