diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-27 00:57:46 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-27 00:57:46 -0300 |
commit | 24200a825482146d51582f7bc01843b333ad077b (patch) | |
tree | d725589b69bd69eb87c746a6be29ca434378b3eb /linux/drivers/media/video/bt8xx/bttv-cards.c | |
parent | 6227b082cd90bc4d597aa4a92767a73cee0992c8 (diff) | |
parent | 39f23e29bc83e1cf8c8a513001df33a222ee3869 (diff) | |
download | mediapointer-dvb-s2-24200a825482146d51582f7bc01843b333ad077b.tar.gz mediapointer-dvb-s2-24200a825482146d51582f7bc01843b333ad077b.tar.bz2 |
merge: http://linuxtv.org/hg/~mkrufky/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/bt8xx/bttv-cards.c')
-rw-r--r-- | linux/drivers/media/video/bt8xx/bttv-cards.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/bt8xx/bttv-cards.c b/linux/drivers/media/video/bt8xx/bttv-cards.c index 3584c3473..4b1ccf817 100644 --- a/linux/drivers/media/video/bt8xx/bttv-cards.c +++ b/linux/drivers/media/video/bt8xx/bttv-cards.c @@ -4937,7 +4937,7 @@ static void picolo_tetra_muxsel (struct bttv* btv, unsigned int input) * * The IVC120G security card has 4 i2c controlled TDA8540 matrix * swichers to provide 16 channels to MUX0. The TDA8540's have - * 4 indepedant outputs and as such the IVC120G also has the + * 4 independent outputs and as such the IVC120G also has the * optional "Monitor Out" bus. This allows the card to be looking * at one input while the monitor is looking at another. * |