From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Fri, 20 Mar 2009 00:41:08 +0000 (-0300)
Subject: V4L/DVB (11111): dvb_dummy_fe: Fix compilation breakage
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=dcd241c384357e5c146299d45d2ee2f4ad439723;p=mv-sheeva.git

V4L/DVB (11111): dvb_dummy_fe: Fix compilation breakage

As reported by Randy Dunlap <randy.dunlap@oracle.com>:
ERROR: "dvb_dummy_fe_ofdm_attach" [drivers/media/video/cx231xx/cx231xx-dvb.ko] undefined!

This happens since cx231xx DVB part still misses the frontend modules.
So, the dummy frontend were used for development. The proper fix is to
implement the DVB modules there, as they will be required.

While this won't happen, lets allow the compilation with or without the
dummy FE testing module.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---

diff --git a/drivers/media/dvb/frontends/dvb_dummy_fe.h b/drivers/media/dvb/frontends/dvb_dummy_fe.h
index 8210f19d56c..1fcb987d638 100644
--- a/drivers/media/dvb/frontends/dvb_dummy_fe.h
+++ b/drivers/media/dvb/frontends/dvb_dummy_fe.h
@@ -25,8 +25,27 @@
 #include <linux/dvb/frontend.h>
 #include "dvb_frontend.h"
 
+#if defined(CONFIG_DVB_DUMMY_FE) || (defined(CONFIG_DVB_DUMMY_FE_MODULE) && \
+defined(MODULE))
 extern struct dvb_frontend* dvb_dummy_fe_ofdm_attach(void);
 extern struct dvb_frontend* dvb_dummy_fe_qpsk_attach(void);
 extern struct dvb_frontend* dvb_dummy_fe_qam_attach(void);
+#else
+static inline struct dvb_frontend *dvb_dummy_fe_ofdm_attach(void)
+{
+	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
+	return NULL;
+}
+static inline struct dvb_frontend *dvb_dummy_fe_qpsk_attach(void)
+{
+	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
+	return NULL;
+}
+static inline struct dvb_frontend *dvb_dummy_fe_qam_attach(void)
+{
+	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
+	return NULL;
+}
+#endif /* CONFIG_DVB_DUMMY_FE */
 
 #endif // DVB_DUMMY_FE_H