summaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/frontends/cx22700.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-04-18 17:12:14 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-04-18 17:12:14 +0100
commitfac56c2df51bc29b07b3c2dcfabf32a015a0522c (patch)
tree1ff5d84ecf4ea0bcbd42e2ef9624b5ade3810890 /drivers/media/dvb/frontends/cx22700.c
parent6caa15d0b84d2ea688fd31f4f172c8353463e109 (diff)
parenta6360dd37e1a144ed11e6548371bade559a1e4df (diff)
downloadop-kernel-dev-fac56c2df51bc29b07b3c2dcfabf32a015a0522c.zip
op-kernel-dev-fac56c2df51bc29b07b3c2dcfabf32a015a0522c.tar.gz
Merge commit 'v2.6.39-rc3' into for-2.6.39
Diffstat (limited to 'drivers/media/dvb/frontends/cx22700.c')
-rw-r--r--drivers/media/dvb/frontends/cx22700.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb/frontends/cx22700.c b/drivers/media/dvb/frontends/cx22700.c
index 5fbc0fc..0142214 100644
--- a/drivers/media/dvb/frontends/cx22700.c
+++ b/drivers/media/dvb/frontends/cx22700.c
@@ -179,7 +179,7 @@ static int cx22700_set_tps (struct cx22700_state *state, struct dvb_ofdm_paramet
cx22700_writereg (state, 0x06, val);
cx22700_writereg (state, 0x08, 0x04 | 0x02); /* use user tps parameters */
- cx22700_writereg (state, 0x08, 0x04); /* restart aquisition */
+ cx22700_writereg (state, 0x08, 0x04); /* restart acquisition */
return 0;
}
OpenPOWER on IntegriCloud