diff options
| author | Trent Piepho <xyzzy@speakeasy.org> | 2006-10-14 22:44:44 +0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-11-03 06:49:40 +0300 |
| commit | c5dec9fb248e3318f30a26f9984b3b064053a77f (patch) | |
| tree | a3138c37d75bcd419a44b7268db76b20ad053add /drivers/media/dvb/frontends/isl6421.h | |
| parent | 9bb6e2593ad4cb94944f547154baee64b4734598 (diff) | |
| download | linux-c5dec9fb248e3318f30a26f9984b3b064053a77f.tar.xz | |
V4L/DVB (4751): Fix DBV_FE_CUSTOMISE for card drivers compiled into kernel
When a front-end is disabled, card drivers that use it are compiled with
a stub version of the front-end's attach function. This way they have no
references to the front-end's code and don't need it to be loaded.
If a card driver is compiled into the kernel, and a front-end is a
module, then that front-end is effectively disabled wrt the card driver.
In this case, the card driver should get the stub version. This was not
happening.
The stub vs real attach function selection is changed so that when the
front-end is a module the real attach function is only used if the card
driver is a module as well. This means a module front-end will be
supported by card drivers that are modules and not supported by card
drivers compiled into the kernel.
Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/dvb/frontends/isl6421.h')
| -rw-r--r-- | drivers/media/dvb/frontends/isl6421.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb/frontends/isl6421.h b/drivers/media/dvb/frontends/isl6421.h index 1916e3eb2df3..ea7f78a7d3cd 100644 --- a/drivers/media/dvb/frontends/isl6421.h +++ b/drivers/media/dvb/frontends/isl6421.h @@ -39,7 +39,7 @@ #define ISL6421_ISEL1 0x20 #define ISL6421_DCL 0x40 -#if defined(CONFIG_DVB_ISL6421) || defined(CONFIG_DVB_ISL6421_MODULE) +#if defined(CONFIG_DVB_ISL6421) || (defined(CONFIG_DVB_ISL6421_MODULE) && defined(MODULE)) /* override_set and override_clear control which system register bits (above) to always set & clear */ extern struct dvb_frontend *isl6421_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, u8 i2c_addr, u8 override_set, u8 override_clear); |