From patchwork Tue Nov 30 23:29:42 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Len Brown X-Patchwork-Id: 369091 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 oAUNU5mP026567 for ; Tue, 30 Nov 2010 23:30:05 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751513Ab0K3XaE (ORCPT ); Tue, 30 Nov 2010 18:30:04 -0500 Received: from vms173005pub.verizon.net ([206.46.173.5]:48894 "EHLO vms173005pub.verizon.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751457Ab0K3XaD (ORCPT ); Tue, 30 Nov 2010 18:30:03 -0500 Received: from localhost.localdomain ([unknown] [74.104.161.234]) by vms173005.mailsrvcs.net (Sun Java(tm) System Messaging Server 7u2-7.02 32bit (built Apr 16 2009)) with ESMTPA id <0LCQ00I0719QT2Y4@vms173005.mailsrvcs.net>; Tue, 30 Nov 2010 17:29:56 -0600 (CST) Received: from localhost.localdomain (x980 [127.0.0.1]) by localhost.localdomain (8.14.4/8.14.4) with ESMTP id oAUNTmkE028955; Tue, 30 Nov 2010 18:29:49 -0500 Received: from localhost (lenb@localhost) by localhost.localdomain (8.14.4/8.14.4/Submit) with ESMTP id oAUNTgqM028950; Tue, 30 Nov 2010 18:29:47 -0500 X-Authentication-warning: localhost.localdomain: lenb owned process doing -bs Date: Tue, 30 Nov 2010 18:29:42 -0500 (EST) From: Len Brown X-X-Sender: lenb@x980 To: Jack Stone Cc: linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, rui.zhang@intel.com Subject: [PATCH] ACPI: video: fix build error when VIDEO_OUTPUT_CONTROL=n In-reply-to: <1288292779-23347-1-git-send-email-jwjstone@fastmail.fm> Message-id: References: <1288292779-23347-1-git-send-email-jwjstone@fastmail.fm> User-Agent: Alpine 2.00 (LFD 1167 2008-08-23) MIME-version: 1.0 Content-type: TEXT/PLAIN; charset=US-ASCII 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]); Tue, 30 Nov 2010 23:30:05 +0000 (UTC) diff --git a/include/linux/video_output.h b/include/linux/video_output.h index 2fb46bc..c630194 100644 --- a/include/linux/video_output.h +++ b/include/linux/video_output.h @@ -34,9 +34,23 @@ struct output_device { struct device dev; }; #define to_output_device(obj) container_of(obj, struct output_device, dev) +#ifdef CONFIG_VIDEO_OUTPUT_CONTROL struct output_device *video_output_register(const char *name, struct device *dev, void *devdata, struct output_properties *op); void video_output_unregister(struct output_device *dev); +#else +static struct output_device *video_output_register(const char *name, + struct device *dev, + void *devdata, + struct output_properties *op) +{ + return ERR_PTR(-ENODEV); +} +static void video_output_unregister(struct output_device *dev) +{ + return; +}; +#endif #endif