Re: [GIT PATCHES for 2.6.28] V4L/DVB fixes, crash inaf9005_usb_module_init()

[Cyrill Gorcunov]

[Mauro Carvalho Chehab - Tue, Dec 30, 2008 at 05:33:10PM -0200]
| 
| On Sat, 27 Dec 2008 20:11:22 +0300
| Cyrill Gorcunov <gorcunov@xxxxxxxxx> wrote:
| 
| > [Ingo Molnar - Sat, Dec 27, 2008 at 05:40:20PM +0100]
| > | 
| > | * Ingo Molnar <mingo@xxxxxxx> wrote:
| > | 
| > | > [...] I have re-enabled the driver in tip/master [...]
| > | 
| > | ok, just got this build failure:
| > | 
| > |  drivers/built-in.o: In function `dm1105_probe':
| > |  dm1105.c:(.devinit.text+0x2298b): undefined reference to `cx24116_attach'
| > |  make: *** [.tmp_vmlinux1] Error 1
| > | 
| > | config attached. Can test any fix patch.
| > | 
| > | 	Ingo
| > |
| > 
| > Something like that?
| 
| I suspect that this will work. Could you please send your SOB?
| 

Without problem :)

---
Subject: [PATCH] DVB: cx24116 - build fix

Add missed MODULE check to eliminate inapropriate
declaration being choosed which causes a build error.

Signed-off-by: Cyrill Gorcunov <gorcunov@xxxxxxxxxx>
---

 drivers/media/dvb/frontends/cx24116.h |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Index: linux-2.6.git/drivers/media/dvb/frontends/cx24116.h
===================================================================
--- linux-2.6.git.orig/drivers/media/dvb/frontends/cx24116.h
+++ linux-2.6.git/drivers/media/dvb/frontends/cx24116.h
@@ -37,7 +37,8 @@ struct cx24116_config {
 	u8 mpg_clk_pos_pol:0x02;
 };
 
-#if defined(CONFIG_DVB_CX24116) || defined(CONFIG_DVB_CX24116_MODULE)
+#if defined(CONFIG_DVB_CX24116) || \
+	(defined(CONFIG_DVB_CX24116_MODULE) && defined(MODULE))
 extern struct dvb_frontend *cx24116_attach(
 	const struct cx24116_config *config,
 	struct i2c_adapter *i2c);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/