diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-06-22 07:12:00 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-06-22 07:12:00 -0300 |
| commit | 8cd12cf4483a6c0b0fd1d221d8c6ebd02236f077 (patch) | |
| tree | 207ec9be4aae5bf5216dcad124e411fbb554231a /linux/drivers/media/dvb/ttpci/av7110.c | |
| parent | f1c16914fc0f794e9febebc7a345fd5c86ebdbd4 (diff) | |
| parent | 2e87dc4bc0ada9acabcc0d704444e8f361490624 (diff) | |
| download | mediapointer-dvb-s2-8cd12cf4483a6c0b0fd1d221d8c6ebd02236f077.tar.gz mediapointer-dvb-s2-8cd12cf4483a6c0b0fd1d221d8c6ebd02236f077.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Fixed a small merge conflicts at:
merging linux/drivers/media/video/cx18/cx18-cards.h
warning: conflicts during merge.
merging linux/drivers/media/video/cx18/cx18-cards.h failed!
Basically, two new structures were added bellow the same place
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/dvb/ttpci/av7110.c')
| -rw-r--r-- | linux/drivers/media/dvb/ttpci/av7110.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/linux/drivers/media/dvb/ttpci/av7110.c b/linux/drivers/media/dvb/ttpci/av7110.c index 073ed350f..cc25b3380 100644 --- a/linux/drivers/media/dvb/ttpci/av7110.c +++ b/linux/drivers/media/dvb/ttpci/av7110.c @@ -1198,7 +1198,6 @@ static int start_ts_capture(struct av7110 *budget) if (budget->feeding1) return ++budget->feeding1; memset(budget->grabbing, 0x00, TS_HEIGHT * TS_WIDTH); - budget->tsf = 0xff; budget->ttbp = 0; SAA7146_IER_ENABLE(budget->dev, MASK_10); /* VPE */ saa7146_write(budget->dev, MC1, (MASK_04 | MASK_20)); /* DMA3 on */ |