diff options
author | Trent Piepho <xyzzy@speakeasy.org> | 2007-01-30 21:26:01 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-21 10:35:11 -0500 |
commit | 05ad390724d1f307111a322325df83282a1479e6 (patch) | |
tree | 8b8dc80c42e3139ae8aa308f80633b92079835f5 /drivers/media/video/cx88/cx88-i2c.c | |
parent | 6827709a6148a6e8530d90027b4f31aa0aaa5ae5 (diff) |
V4L/DVB (5166): Remove obsolete alias defines of CONFIG_* settings
The out of tree v4l-dvb build system didn't always override the kernel's
configuration settings with v4l-dvb's settings correctly. To work around
this, makefiles would define some new macro based on the setting of a
config variable. e.g. the pwc Makefile would define CONFIG_PWC_DEBUG if
CONFIG_USB_PWC_DEBUG (which is defined via Kconfig) was set.
The v4l-dvb build system should now always override correctly, and this
is no longer necessary. This patch gets ride of these extra defines and
just uses the CONFIG_* settings directly.
Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/cx88/cx88-i2c.c')
-rw-r--r-- | drivers/media/video/cx88/cx88-i2c.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/video/cx88/cx88-i2c.c b/drivers/media/video/cx88/cx88-i2c.c index 88af23a93870..9830d5c43921 100644 --- a/drivers/media/video/cx88/cx88-i2c.c +++ b/drivers/media/video/cx88/cx88-i2c.c | |||
@@ -145,6 +145,7 @@ void cx88_call_i2c_clients(struct cx88_core *core, unsigned int cmd, void *arg) | |||
145 | if (0 != core->i2c_rc) | 145 | if (0 != core->i2c_rc) |
146 | return; | 146 | return; |
147 | 147 | ||
148 | #if defined(CONFIG_VIDEO_BUF_DVB) || defined(CONFIG_VIDEO_BUF_DVB_MODULE) | ||
148 | if ( (core->dvbdev) && (core->dvbdev->dvb.frontend) ) { | 149 | if ( (core->dvbdev) && (core->dvbdev->dvb.frontend) ) { |
149 | if (core->dvbdev->dvb.frontend->ops.i2c_gate_ctrl) | 150 | if (core->dvbdev->dvb.frontend->ops.i2c_gate_ctrl) |
150 | core->dvbdev->dvb.frontend->ops.i2c_gate_ctrl(core->dvbdev->dvb.frontend, 1); | 151 | core->dvbdev->dvb.frontend->ops.i2c_gate_ctrl(core->dvbdev->dvb.frontend, 1); |
@@ -154,6 +155,7 @@ void cx88_call_i2c_clients(struct cx88_core *core, unsigned int cmd, void *arg) | |||
154 | if (core->dvbdev->dvb.frontend->ops.i2c_gate_ctrl) | 155 | if (core->dvbdev->dvb.frontend->ops.i2c_gate_ctrl) |
155 | core->dvbdev->dvb.frontend->ops.i2c_gate_ctrl(core->dvbdev->dvb.frontend, 0); | 156 | core->dvbdev->dvb.frontend->ops.i2c_gate_ctrl(core->dvbdev->dvb.frontend, 0); |
156 | } else | 157 | } else |
158 | #endif | ||
157 | i2c_clients_command(&core->i2c_adap, cmd, arg); | 159 | i2c_clients_command(&core->i2c_adap, cmd, arg); |
158 | } | 160 | } |
159 | 161 | ||