From patchwork Thu Oct 28 19:06:18 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jack Stone X-Patchwork-Id: 288222 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o9SJ6GZc007733 for ; Thu, 28 Oct 2010 19:06:31 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758771Ab0J1TGa (ORCPT ); Thu, 28 Oct 2010 15:06:30 -0400 Received: from out2.smtp.messagingengine.com ([66.111.4.26]:37339 "EHLO out2.smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757152Ab0J1TGa (ORCPT ); Thu, 28 Oct 2010 15:06:30 -0400 Received: from compute2.internal (compute2.nyi.mail.srv.osa [10.202.2.42]) by gateway1.messagingengine.com (Postfix) with ESMTP id 419761FE; Thu, 28 Oct 2010 15:06:28 -0400 (EDT) Received: from frontend1.messagingengine.com ([10.202.2.160]) by compute2.internal (MEProxy); Thu, 28 Oct 2010 15:06:28 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=messagingengine.com; h=from:to:cc:subject:date:message-id; s=smtpout; bh=/Kcy3i97WT1wi2hBSZiiEEsDGHg=; b=WqLTZZA3RMQSRkIwIPxQXXoYTWWPnS84sicdFrCv3592kAx3Ap2Krgex6CEG9RujVw8YDhEZz3XxLXZzTAr/qxFMz56J8645XZ5vSWkyD5MOIlJQEzjQ/+iijCT3wfcP+BKXtGQ1CLvRbUl5C7dDwSBsdY3a7l/FC5JmpC1yXKM= X-Sasl-enc: Gf2VV47IxZxy5sxkSK4YNFjy03unN2CAGqT/Sl6Gufhg 1288292787 Received: from tiax.inuknetworks.com (unknown [109.175.129.162]) by mail.messagingengine.com (Postfix) with ESMTPSA id 67E894056A8; Thu, 28 Oct 2010 15:06:27 -0400 (EDT) From: jwjstone@fastmail.fm To: linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, lenb@kernel.org, rui.zhang@intel.com Cc: Jack Stone Subject: [PATCH] acpi: Fix the build when the video output switcher is disabled Date: Thu, 28 Oct 2010 20:06:18 +0100 Message-Id: <1288292779-23347-1-git-send-email-jwjstone@fastmail.fm> X-Mailer: git-send-email 1.7.3.2.145.g7ebee 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 (demeter1.kernel.org [140.211.167.41]); Thu, 28 Oct 2010 19:06:31 +0000 (UTC) diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c index 5cd0228..a3ec29e 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c @@ -905,6 +905,7 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device) } +#ifdef CONFIG_VIDEO_OUTPUT_CONTROL if (acpi_video_display_switch_support()) { if (device->cap._DCS && device->cap._DSS) { @@ -919,6 +920,7 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device) kfree(name); } } +#endif } /* @@ -1452,7 +1454,9 @@ static int acpi_video_bus_put_one_device(struct acpi_video_device *device) thermal_cooling_device_unregister(device->cooling_dev); device->cooling_dev = NULL; } +#ifdef CONFIG_VIDEO_OUTPUT_CONTROL video_output_unregister(device->output_dev); +#endif return 0; }