Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=b97762ba18b57c7057b58ed4f7140a19d0166b01
Commit:     b97762ba18b57c7057b58ed4f7140a19d0166b01
Parent:     19dc74b7c5f02ada19840a85582f42f4dddcdb3e
Author:     Trent Piepho <[EMAIL PROTECTED]>
AuthorDate: Tue Jul 31 18:51:30 2007 -0300
Committer:  Mauro Carvalho Chehab <[EMAIL PROTECTED]>
CommitDate: Tue Oct 9 22:04:33 2007 -0300

    V4L/DVB (5976): mt2131 s5h1409: correct frontend selection logic
    
    If a card driver is compiled into the kernel and mt2131 or s5h1409 are
    compiled as modules, the kernel won't link.
    
    A compiled in driver can't use a module, so in this case the mt2131 or 
s5h1409
    are effectively disabled w.r.t the compiled in driver and the stub attach
    function should be used.
    
    Signed-off-by: Trent Piepho <[EMAIL PROTECTED]>
    Acked-by: Michael Krufky <[EMAIL PROTECTED]>
    Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
---
 drivers/media/dvb/frontends/mt2131.h  |    2 +-
 drivers/media/dvb/frontends/s5h1409.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/media/dvb/frontends/mt2131.h 
b/drivers/media/dvb/frontends/mt2131.h
index 608f1f6..1e4ffe7 100644
--- a/drivers/media/dvb/frontends/mt2131.h
+++ b/drivers/media/dvb/frontends/mt2131.h
@@ -30,7 +30,7 @@ struct mt2131_config {
        u8 clock_out; /* 0 = off, 1 = CLK/4, 2 = CLK/2, 3 = CLK/1 */
 };
 
-#if defined(CONFIG_DVB_TUNER_MT2131) || defined(CONFIG_DVB_TUNER_MT2131_MODULE)
+#if defined(CONFIG_DVB_TUNER_MT2131) || 
(defined(CONFIG_DVB_TUNER_MT2131_MODULE) && defined(MODULE))
 extern struct dvb_frontend* mt2131_attach(struct dvb_frontend *fe,
                                          struct i2c_adapter *i2c,
                                          struct mt2131_config *cfg,
diff --git a/drivers/media/dvb/frontends/s5h1409.h 
b/drivers/media/dvb/frontends/s5h1409.h
index bccfd8a..20f9af1 100644
--- a/drivers/media/dvb/frontends/s5h1409.h
+++ b/drivers/media/dvb/frontends/s5h1409.h
@@ -53,7 +53,7 @@ struct s5h1409_config
        u8 status_mode;
 };
 
-#if defined(CONFIG_DVB_S5H1409) || defined(CONFIG_DVB_S5H1409_MODULE)
+#if defined(CONFIG_DVB_S5H1409) || (defined(CONFIG_DVB_S5H1409_MODULE) && 
defined(MODULE))
 extern struct dvb_frontend* s5h1409_attach(const struct s5h1409_config* config,
                                           struct i2c_adapter* i2c);
 #else
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to