From 7541c77e4d038366d5642701a511ade2ccd1138d Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Wed, 18 Feb 2004 04:59:42 -0800 Subject: [PATCH] tuner driver fixes From: Gerd Knorr "options tuner type=2" is just there for historical reasons and should only be used/needed if the main driver doesn't allow to configure the tuner type. I'm not sure whenever I can remove that altogether without breaking anything. There are several users of the tuner module, some outside the standard kernel tree ... > > if (type < TUNERS) { > > + t->type = type; > > printk("tuner: type forced to %d (%s) [insmod]\n", > > t->type,tuners[t->type].name); > > set_type(client,type); That is wrong, it will break in other corner cases, it may cause the set_type() function not doing the initializations. The prink can also be dropped because set_type does that too. The patch below removes that. It also makes the kernel messages a bit more verbose and adds support for two new tuners. --- include/media/tuner.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/media/tuner.h b/include/media/tuner.h index 15657395aa12..fb571d5965d8 100644 --- a/include/media/tuner.h +++ b/include/media/tuner.h @@ -67,7 +67,9 @@ #define TUNER_HITACHI_NTSC 40 #define TUNER_PHILIPS_PAL_MK 41 #define TUNER_PHILIPS_ATSC 42 -#define TUNER_PHILIPS_FM1236_MK3 43 +#define TUNER_PHILIPS_FM1236_MK3 43 +#define TUNER_PHILIPS_4IN1 44 /* ATI TV Wonder Pro - Conexant */ +#define TUNER_MICROTUNE_4049FM5 45 #define NOTUNER 0 #define PAL 1 /* PAL_BG */ -- cgit v1.2.3