diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-09-11 11:13:58 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-09-11 11:13:58 +0200 |
commit | 6ef62164e794c480259ac158aa6c8c7b85746545 (patch) | |
tree | c4540211d0cef9c88d96f30f89ac4b9c1a570683 /drivers/media/dvb/frontends/s5h1411.c | |
parent | e75b986af7881ed8d8ccb1ed154045ed17cfebd0 (diff) | |
parent | adee14b2e1557d0a8559f29681732d05a89dfc35 (diff) | |
download | op-kernel-dev-6ef62164e794c480259ac158aa6c8c7b85746545.zip op-kernel-dev-6ef62164e794c480259ac158aa6c8c7b85746545.tar.gz |
Merge commit 'v2.6.27-rc6' into timers/urgent
Diffstat (limited to 'drivers/media/dvb/frontends/s5h1411.c')
-rw-r--r-- | drivers/media/dvb/frontends/s5h1411.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/dvb/frontends/s5h1411.c b/drivers/media/dvb/frontends/s5h1411.c index cff360c..2da1a37 100644 --- a/drivers/media/dvb/frontends/s5h1411.c +++ b/drivers/media/dvb/frontends/s5h1411.c @@ -1,7 +1,7 @@ /* Samsung S5H1411 VSB/QAM demodulator driver - Copyright (C) 2008 Steven Toth <stoth@hauppauge.com> + Copyright (C) 2008 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 @@ -488,6 +488,7 @@ static int s5h1411_enable_modulation(struct dvb_frontend *fe, break; case QAM_64: case QAM_256: + case QAM_AUTO: dprintk("%s() QAM_AUTO (64/256)\n", __func__); s5h1411_set_if_freq(fe, state->config->qam_if); s5h1411_writereg(state, S5H1411_I2C_TOP_ADDR, 0x00, 0x0171); |