diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-05-24 02:24:52 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-05-24 02:24:52 -0400 |
| commit | d08fe475120e3f17df37656d0644c0f17a797852 (patch) | |
| tree | 64f0324afa9e884d8f0d738930a2495ba411c897 /drivers/media/video/cx18/cx18-cards.h | |
| parent | fb66c5238547495b4a79f590b20400683702448a (diff) | |
| parent | d762f4383100c2a87b1a3f2d678cd3b5425655b4 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into rmobile-latest
Diffstat (limited to 'drivers/media/video/cx18/cx18-cards.h')
| -rw-r--r-- | drivers/media/video/cx18/cx18-cards.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/cx18/cx18-cards.h b/drivers/media/video/cx18/cx18-cards.h index 3e750068f275..add7391ecaba 100644 --- a/drivers/media/video/cx18/cx18-cards.h +++ b/drivers/media/video/cx18/cx18-cards.h | |||
| @@ -109,7 +109,7 @@ struct cx18_card_tuner { | |||
| 109 | 109 | ||
| 110 | struct cx18_card_tuner_i2c { | 110 | struct cx18_card_tuner_i2c { |
| 111 | unsigned short radio[2];/* radio tuner i2c address to probe */ | 111 | unsigned short radio[2];/* radio tuner i2c address to probe */ |
| 112 | unsigned short demod[2];/* demodulator i2c address to probe */ | 112 | unsigned short demod[3];/* demodulator i2c address to probe */ |
| 113 | unsigned short tv[4]; /* tv tuner i2c addresses to probe */ | 113 | unsigned short tv[4]; /* tv tuner i2c addresses to probe */ |
| 114 | }; | 114 | }; |
| 115 | 115 | ||