From patchwork Wed Feb 17 09:42:43 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Mack X-Patchwork-Id: 79858 Received: from lists.sourceforge.net (lists.sourceforge.net [216.34.181.88]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o1HAhQiq018343 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Wed, 17 Feb 2010 10:44:02 GMT Received: from localhost ([127.0.0.1] helo=sfs-ml-4.v29.ch3.sourceforge.com) by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.69) (envelope-from ) id 1NhhMR-0000Lj-JD; Wed, 17 Feb 2010 10:42:27 +0000 Received: from sfi-mx-2.v28.ch3.sourceforge.com ([172.29.28.122] helo=mx.sourceforge.net) by sfs-ml-3.v29.ch3.sourceforge.com with esmtp (Exim 4.69) (envelope-from ) id 1NhgRH-0000hg-Ez for dri-devel@lists.sourceforge.net; Wed, 17 Feb 2010 09:43:23 +0000 Received-SPF: pass (sfi-mx-2.v28.ch3.sourceforge.com: domain of caiaq.de designates 212.112.241.133 as permitted sender) client-ip=212.112.241.133; envelope-from=daniel@caiaq.de; helo=buzzloop.caiaq.de; Received: from buzzloop.caiaq.de ([212.112.241.133]) by sfi-mx-2.v28.ch3.sourceforge.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.69) id 1NhgRG-0000aJ-7I for dri-devel@lists.sourceforge.net; Wed, 17 Feb 2010 09:43:23 +0000 Received: from localhost (localhost [127.0.0.1]) by buzzloop.caiaq.de (Postfix) with ESMTP id BFD4E84000C; Wed, 17 Feb 2010 10:43:07 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at buzzloop.caiaq.de Received: from buzzloop.caiaq.de ([127.0.0.1]) by localhost (buzzloop.caiaq.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Bv-WV1AzzvKB; Wed, 17 Feb 2010 10:42:49 +0100 (CET) Received: from localhost.localdomain (pd95699b2.dip0.t-ipconnect.de [217.86.153.178]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by buzzloop.caiaq.de (Postfix) with ESMTPSA id 07F1B84000A; Wed, 17 Feb 2010 10:42:48 +0100 (CET) From: Daniel Mack To: linux-kernel@vger.kernel.org Subject: [PATCH] nouveau: fix undefined reference to acpi_lid_open Date: Wed, 17 Feb 2010 10:42:43 +0100 Message-Id: <1266399763-28911-1-git-send-email-daniel@caiaq.de> X-Mailer: git-send-email 1.6.5.2 X-Spam-Score: -1.5 (-) X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -1.5 SPF_CHECK_PASS SPF reports sender host as permitted sender for sender-domain -0.0 SPF_PASS SPF: sender matches SPF record X-Headers-End: 1NhgRG-0000aJ-7I X-Mailman-Approved-At: Wed, 17 Feb 2010 10:42:27 +0000 Cc: dri-devel@lists.sourceforge.net, David Airlie , Ben Skeggs , Daniel Mack , Xavier Chantry X-BeenThere: dri-devel@lists.sourceforge.net X-Mailman-Version: 2.1.9 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.sourceforge.net X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Wed, 17 Feb 2010 10:44:02 +0000 (UTC) diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c index d2f6335..c74d45d 100644 --- a/drivers/gpu/drm/nouveau/nouveau_connector.c +++ b/drivers/gpu/drm/nouveau/nouveau_connector.c @@ -239,7 +239,7 @@ nouveau_connector_detect(struct drm_connector *connector) if (connector->connector_type == DRM_MODE_CONNECTOR_LVDS) nv_encoder = find_encoder_by_type(connector, OUTPUT_LVDS); if (nv_encoder && nv_connector->native_mode) { -#ifdef CONFIG_ACPI +#ifdef CONFIG_ACPI_BUTTON if (!nouveau_ignorelid && !acpi_lid_open()) return connector_status_disconnected; #endif