diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-10 03:25:29 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-10 03:25:29 -0400 |
| commit | 8eb95f28f66b1a5461fdbcc9a1ee9068fb2cf2b6 (patch) | |
| tree | e42d0e004b07f86d38de930fc163f3ca7d121f9c /drivers/media/video/cx18/cx18-cards.c | |
| parent | d7451fca18e2ec62641ae4bbfe946069f13765a3 (diff) | |
| parent | 3fa8749e584b55f1180411ab1b51117190bac1e5 (diff) | |
Merge commit 'v2.6.27' into timers/hpet
Diffstat (limited to 'drivers/media/video/cx18/cx18-cards.c')
| -rw-r--r-- | drivers/media/video/cx18/cx18-cards.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/cx18/cx18-cards.c b/drivers/media/video/cx18/cx18-cards.c index 8fe5f38c4d7c..3cb9734ec07b 100644 --- a/drivers/media/video/cx18/cx18-cards.c +++ b/drivers/media/video/cx18/cx18-cards.c | |||
| @@ -163,7 +163,7 @@ static const struct cx18_card cx18_card_h900 = { | |||
| 163 | }, | 163 | }, |
| 164 | .audio_inputs = { | 164 | .audio_inputs = { |
| 165 | { CX18_CARD_INPUT_AUD_TUNER, | 165 | { CX18_CARD_INPUT_AUD_TUNER, |
| 166 | CX18_AV_AUDIO8, 0 }, | 166 | CX18_AV_AUDIO5, 0 }, |
| 167 | { CX18_CARD_INPUT_LINE_IN1, | 167 | { CX18_CARD_INPUT_LINE_IN1, |
| 168 | CX18_AV_AUDIO_SERIAL1, 0 }, | 168 | CX18_AV_AUDIO_SERIAL1, 0 }, |
| 169 | }, | 169 | }, |