Module: xenomai-2.6
Branch: master
Commit: c4279170ef5bb8c187434b1cfbce7c867c6440c8
URL:
http://git.xenomai.org/?p=xenomai-2.6.git;a=commit;h=c4279170ef5bb8c187434b1cfbce7c867c6440c8
Author: Gilles Chanteperdrix <gilles.chanteperd...@xenomai.org>
Date: Sun Sep 7 20:55:22 2014 +0200
analogy: fix undefined referencces
when compiling with analogy support but without CONFIG_XENO_OPT_PERVASIVE.
ksrc/drivers/analogy/device.c references a4l_proc_root defined in
ksrc/drivers/analogy/rtdm_interface.c, but this last file is only compiled
if CONFIG_XENO_OPT_PERVASIVE is enabled.
So, go the easy way out and disable analogy proc support without
CONFIG_XENO_OPT_PERVASIVE.
---
ksrc/drivers/analogy/device.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/ksrc/drivers/analogy/device.c b/ksrc/drivers/analogy/device.c
index 60b2977..843efdc 100644
--- a/ksrc/drivers/analogy/device.c
+++ b/ksrc/drivers/analogy/device.c
@@ -67,7 +67,7 @@ void a4l_set_dev(a4l_cxt_t *cxt)
/* --- Device tab proc section --- */
-#ifdef CONFIG_PROC_FS
+#if defined(CONFIG_PROC_FS) && defined(CONFIG_XENO_OPT_PERVASIVE)
int a4l_rdproc_devs(struct seq_file *p, void *data)
{
@@ -168,7 +168,7 @@ void a4l_proc_detach(a4l_cxt_t * cxt)
rtdm_free(entry_name);
}
-#else /* !CONFIG_PROC_FS */
+#else /* !CONFIG_PROC_FS || !CONFIG_XENO_OPT_PERVASIVE */
int a4l_proc_attach(a4l_cxt_t * cxt)
{
@@ -179,7 +179,7 @@ void a4l_proc_detach(a4l_cxt_t * cxt)
{
}
-#endif /* CONFIG_PROC_FS */
+#endif /* !CONFIG_PROC_FS || !CONFIG_XENO_OPT_PERVASIVE */
/* --- Attach / detach section --- */
_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
http://www.xenomai.org/mailman/listinfo/xenomai-git
