diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-28 14:06:39 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-28 14:06:39 -0400 |
| commit | f28e71617ddaf2483e3e5c5237103484a303743f (patch) | |
| tree | 67627d2d8ddbf6a4449371e9261d796c013b1fa1 /drivers/media/video/bt8xx | |
| parent | dc6a78f1af10d28fb8c395034ae1e099b85c05b0 (diff) | |
| parent | a39727f212426b9d5f9267b3318a2afaf9922d3b (diff) | |
Merge ../linux-2.6/
Conflicts:
drivers/scsi/aacraid/comminit.c
Fixed up by removing the now renamed CONFIG_IOMMU option from
aacraid
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/media/video/bt8xx')
| -rw-r--r-- | drivers/media/video/bt8xx/bttv-cards.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/bt8xx/bttv-cards.c b/drivers/media/video/bt8xx/bttv-cards.c index 3116345c93b1..e68a6d2fff24 100644 --- a/drivers/media/video/bt8xx/bttv-cards.c +++ b/drivers/media/video/bt8xx/bttv-cards.c | |||
| @@ -4848,7 +4848,7 @@ static void picolo_tetra_muxsel (struct bttv* btv, unsigned int input) | |||
| 4848 | * | 4848 | * |
| 4849 | * The IVC120G security card has 4 i2c controlled TDA8540 matrix | 4849 | * The IVC120G security card has 4 i2c controlled TDA8540 matrix |
| 4850 | * swichers to provide 16 channels to MUX0. The TDA8540's have | 4850 | * swichers to provide 16 channels to MUX0. The TDA8540's have |
| 4851 | * 4 indepedant outputs and as such the IVC120G also has the | 4851 | * 4 independent outputs and as such the IVC120G also has the |
| 4852 | * optional "Monitor Out" bus. This allows the card to be looking | 4852 | * optional "Monitor Out" bus. This allows the card to be looking |
| 4853 | * at one input while the monitor is looking at another. | 4853 | * at one input while the monitor is looking at another. |
| 4854 | * | 4854 | * |