diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-09-05 10:20:56 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-09-05 10:20:56 -0300 |
| commit | 5f2d82cefe0ce930f3146875c88b993695c7e03a (patch) | |
| tree | 2d33fe6b5949e509d85f48f5c8331adcb22151d3 /linux/drivers/media/dvb/frontends/s5h1409.c | |
| parent | ad789ba2904603896206a72f0445e8ba56da7134 (diff) | |
| parent | 2257e70baa578d959dc4bdcce498ef07d2af00da (diff) | |
| download | mediapointer-dvb-s2-5f2d82cefe0ce930f3146875c88b993695c7e03a.tar.gz mediapointer-dvb-s2-5f2d82cefe0ce930f3146875c88b993695c7e03a.tar.bz2 | |
merge: http://linuxtv.org/hg/~awalls/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Fixed a trivial conflict between a janitor's patch from Hans Verkuil and
Andy patch series.
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/dvb/frontends/s5h1409.c')
| -rw-r--r-- | linux/drivers/media/dvb/frontends/s5h1409.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linux/drivers/media/dvb/frontends/s5h1409.c b/linux/drivers/media/dvb/frontends/s5h1409.c index 5ddb2dca3..7500a1c53 100644 --- a/linux/drivers/media/dvb/frontends/s5h1409.c +++ b/linux/drivers/media/dvb/frontends/s5h1409.c @@ -1,7 +1,7 @@ /* Samsung S5H1409 VSB/QAM demodulator driver - Copyright (C) 2006 Steven Toth <stoth@hauppauge.com> + Copyright (C) 2006 Steven Toth <stoth@linuxtv.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -404,6 +404,7 @@ static int s5h1409_enable_modulation(struct dvb_frontend* fe, break; case QAM_64: case QAM_256: + case QAM_AUTO: dprintk("%s() QAM_AUTO (64/256)\n", __func__); if (state->if_freq != S5H1409_QAM_IF_FREQ) s5h1409_set_if_freq(fe, S5H1409_QAM_IF_FREQ); |