diff options
| author | Andrew Morton <akpm@osdl.org> | 2004-02-18 04:59:42 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-02-18 04:59:42 -0800 |
| commit | 7541c77e4d038366d5642701a511ade2ccd1138d (patch) | |
| tree | 37eb187398cabc9709f2548d21289ab51b2b61ea /include | |
| parent | 61ac12a0eb10224867fa820a5639a7b1feca7bf5 (diff) | |
[PATCH] tuner driver fixes
From: Gerd Knorr <kraxel@bytesex.org>
"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.
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/tuner.h | 4 |
1 files changed, 3 insertions, 1 deletions
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 */ |