aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/pci/saa7134/saa7134.h
diff options
context:
space:
mode:
authorOndrej Zary <linux@rainbow-software.org>2013-04-06 13:21:36 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-04-08 06:01:36 -0400
commitcdcd141c95f0c2b88e0b0869028c320cd031a23b (patch)
treec6595152b71a5aa24bdd741a606212c6e72030d8 /drivers/media/pci/saa7134/saa7134.h
parent5b0e5350cecb5a370ecdaa71ac113728e36e1d55 (diff)
[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 'drivers/media/pci/saa7134/saa7134.h')
-rw-r--r--drivers/media/pci/saa7134/saa7134.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/pci/saa7134/saa7134.h b/drivers/media/pci/saa7134/saa7134.h
index 62169dd74c6a..b90b48821104 100644
--- a/drivers/media/pci/saa7134/saa7134.h
+++ b/drivers/media/pci/saa7134/saa7134.h
@@ -45,6 +45,7 @@
45#if IS_ENABLED(CONFIG_VIDEO_SAA7134_DVB) 45#if IS_ENABLED(CONFIG_VIDEO_SAA7134_DVB)
46#include <media/videobuf-dvb.h> 46#include <media/videobuf-dvb.h>
47#endif 47#endif
48#include "tda8290.h"
48 49
49#define UNSET (-1U) 50#define UNSET (-1U)
50 51
@@ -390,7 +391,7 @@ struct saa7134_board {
390 unsigned char rds_addr; 391 unsigned char rds_addr;
391 392
392 unsigned int tda9887_conf; 393 unsigned int tda9887_conf;
393 unsigned int tuner_config; 394 struct tda829x_config tda829x_conf;
394 395
395 /* peripheral I/O */ 396 /* peripheral I/O */
396 enum saa7134_video_out video_out; 397 enum saa7134_video_out video_out;