From: Len Brown <lenb@kernel.org>
To: Jack Stone <jwjstone@fastmail.fm>
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
Date: Tue, 30 Nov 2010 18:29:42 -0500 (EST) [thread overview]
Message-ID: <alpine.LFD.2.00.1011301828410.3354@x980> (raw)
In-Reply-To: <1288292779-23347-1-git-send-email-jwjstone@fastmail.fm>
From: Len Brown <len.brown@intel.com>
drivers/built-in.o: In function `acpi_video_bus_put_devices':
video.c:(.text+0x79663): undefined reference to
`video_output_unregister'
drivers/built-in.o: In function `acpi_video_bus_add':
video.c:(.text+0x7b0b3): undefined reference to `video_output_register'
Signed-off-by: Len Brown <len.brown@intel.com>
---
include/linux/video_output.h | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
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
--
1.7.3.2.343.g7d43d
prev parent reply other threads:[~2010-11-30 23:30 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-28 19:06 [PATCH] acpi: Fix the build when the video output switcher is disabled jwjstone
2010-11-30 23:29 ` Len Brown [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.LFD.2.00.1011301828410.3354@x980 \
--to=lenb@kernel.org \
--cc=jwjstone@fastmail.fm \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rui.zhang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®