summaryrefslogtreecommitdiff
path: root/include/media
diff options
context:
space:
mode:
authorOndrej Zary <linux@rainbow-software.org>2013-04-06 14:21:36 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-04-08 07:01:36 -0300
commitcdcd141c95f0c2b88e0b0869028c320cd031a23b (patch)
treec6595152b71a5aa24bdd741a606212c6e72030d8 /include/media
parent5b0e5350cecb5a370ecdaa71ac113728e36e1d55 (diff)
downloadlinux-3.10-cdcd141c95f0c2b88e0b0869028c320cd031a23b.tar.gz
linux-3.10-cdcd141c95f0c2b88e0b0869028c320cd031a23b.tar.bz2
linux-3.10-cdcd141c95f0c2b88e0b0869028c320cd031a23b.zip
[media] tuner-core: Change config from unsigned int to void *
config looks like a hack that was added to tuner-core to allow some configuration of TDA8290 tuner (it's not used by any other driver). But with the new configuration options of tda8290 driver (no_i2c_gate and std_map), it's no longer sufficient. Change config to be void * instead, which allows passing tuner-dependent config struct to drivers. Also update saa7134 driver to reflect this change (no other driver uses this). Signed-off-by: Ondrej Zary <linux@rainbow-software.org> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include/media')
-rw-r--r--include/media/tuner.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/media/tuner.h b/include/media/tuner.h
index 24eaafe461b..b46ebb48fe7 100644
--- a/include/media/tuner.h
+++ b/include/media/tuner.h
@@ -192,7 +192,7 @@ struct tuner_setup {
unsigned short addr; /* I2C address */
unsigned int type; /* Tuner type */
unsigned int mode_mask; /* Allowed tuner modes */
- unsigned int config; /* configuraion for more complex tuners */
+ void *config; /* configuraion for more complex tuners */
int (*tuner_callback) (void *dev, int component, int cmd, int arg);
};