From 5ab5af8538f774deb6c40b56fa03651b9e8273dc Mon Sep 17 00:00:00 2001 From: Trent Piepho Date: Tue, 31 Jul 2007 18:51:30 -0300 Subject: [PATCH] --- yaml --- r: 65712 b: refs/heads/master c: b97762ba18b57c7057b58ed4f7140a19d0166b01 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/frontends/mt2131.h | 2 +- trunk/drivers/media/dvb/frontends/s5h1409.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3c597d7cc490..6d5367f5ceb2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 19dc74b7c5f02ada19840a85582f42f4dddcdb3e +refs/heads/master: b97762ba18b57c7057b58ed4f7140a19d0166b01 diff --git a/trunk/drivers/media/dvb/frontends/mt2131.h b/trunk/drivers/media/dvb/frontends/mt2131.h index 608f1f66c9e7..1e4ffe7dc8c8 100644 --- a/trunk/drivers/media/dvb/frontends/mt2131.h +++ b/trunk/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/trunk/drivers/media/dvb/frontends/s5h1409.h b/trunk/drivers/media/dvb/frontends/s5h1409.h index bccfd8a6fbd4..20f9af1af445 100644 --- a/trunk/drivers/media/dvb/frontends/s5h1409.h +++ b/trunk/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