summaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/frontends/s5h1409.h
diff options
context:
space:
mode:
authorTrent Piepho <xyzzy@speakeasy.org>2007-07-31 18:51:30 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-10-09 22:04:33 -0300
commitb97762ba18b57c7057b58ed4f7140a19d0166b01 (patch)
treeed4c9d0f08e3b1c7d18f8c120a9ad587829706ba /drivers/media/dvb/frontends/s5h1409.h
parent19dc74b7c5f02ada19840a85582f42f4dddcdb3e (diff)
downloadblackbird-op-linux-b97762ba18b57c7057b58ed4f7140a19d0166b01.tar.gz
blackbird-op-linux-b97762ba18b57c7057b58ed4f7140a19d0166b01.zip
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 <xyzzy@speakeasy.org> Acked-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/dvb/frontends/s5h1409.h')
-rw-r--r--drivers/media/dvb/frontends/s5h1409.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb/frontends/s5h1409.h b/drivers/media/dvb/frontends/s5h1409.h
index bccfd8a6fbd4..20f9af1af445 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
OpenPOWER on IntegriCloud