diff options
Diffstat (limited to 'drivers/media/video/cx231xx/cx231xx-cards.c')
| -rw-r--r-- | drivers/media/video/cx231xx/cx231xx-cards.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/media/video/cx231xx/cx231xx-cards.c b/drivers/media/video/cx231xx/cx231xx-cards.c index ff534fe7f4a3..a54908235009 100644 --- a/drivers/media/video/cx231xx/cx231xx-cards.c +++ b/drivers/media/video/cx231xx/cx231xx-cards.c | |||
| @@ -68,19 +68,19 @@ struct cx231xx_board cx231xx_boards[] = { | |||
| 68 | .type = CX231XX_VMUX_TELEVISION, | 68 | .type = CX231XX_VMUX_TELEVISION, |
| 69 | .vmux = CX231XX_VIN_3_1, | 69 | .vmux = CX231XX_VIN_3_1, |
| 70 | .amux = CX231XX_AMUX_VIDEO, | 70 | .amux = CX231XX_AMUX_VIDEO, |
| 71 | .gpio = 0, | 71 | .gpio = NULL, |
| 72 | }, { | 72 | }, { |
| 73 | .type = CX231XX_VMUX_COMPOSITE1, | 73 | .type = CX231XX_VMUX_COMPOSITE1, |
| 74 | .vmux = CX231XX_VIN_2_1, | 74 | .vmux = CX231XX_VIN_2_1, |
| 75 | .amux = CX231XX_AMUX_LINE_IN, | 75 | .amux = CX231XX_AMUX_LINE_IN, |
| 76 | .gpio = 0, | 76 | .gpio = NULL, |
| 77 | }, { | 77 | }, { |
| 78 | .type = CX231XX_VMUX_SVIDEO, | 78 | .type = CX231XX_VMUX_SVIDEO, |
| 79 | .vmux = CX231XX_VIN_1_1 | | 79 | .vmux = CX231XX_VIN_1_1 | |
| 80 | (CX231XX_VIN_1_2 << 8) | | 80 | (CX231XX_VIN_1_2 << 8) | |
| 81 | CX25840_SVIDEO_ON, | 81 | CX25840_SVIDEO_ON, |
| 82 | .amux = CX231XX_AMUX_LINE_IN, | 82 | .amux = CX231XX_AMUX_LINE_IN, |
| 83 | .gpio = 0, | 83 | .gpio = NULL, |
| 84 | } | 84 | } |
| 85 | }, | 85 | }, |
| 86 | }, | 86 | }, |
| @@ -107,19 +107,19 @@ struct cx231xx_board cx231xx_boards[] = { | |||
| 107 | .type = CX231XX_VMUX_TELEVISION, | 107 | .type = CX231XX_VMUX_TELEVISION, |
| 108 | .vmux = CX231XX_VIN_3_1, | 108 | .vmux = CX231XX_VIN_3_1, |
| 109 | .amux = CX231XX_AMUX_VIDEO, | 109 | .amux = CX231XX_AMUX_VIDEO, |
| 110 | .gpio = 0, | 110 | .gpio = NULL, |
| 111 | }, { | 111 | }, { |
| 112 | .type = CX231XX_VMUX_COMPOSITE1, | 112 | .type = CX231XX_VMUX_COMPOSITE1, |
| 113 | .vmux = CX231XX_VIN_2_1, | 113 | .vmux = CX231XX_VIN_2_1, |
| 114 | .amux = CX231XX_AMUX_LINE_IN, | 114 | .amux = CX231XX_AMUX_LINE_IN, |
| 115 | .gpio = 0, | 115 | .gpio = NULL, |
| 116 | }, { | 116 | }, { |
| 117 | .type = CX231XX_VMUX_SVIDEO, | 117 | .type = CX231XX_VMUX_SVIDEO, |
| 118 | .vmux = CX231XX_VIN_1_1 | | 118 | .vmux = CX231XX_VIN_1_1 | |
| 119 | (CX231XX_VIN_1_2 << 8) | | 119 | (CX231XX_VIN_1_2 << 8) | |
| 120 | CX25840_SVIDEO_ON, | 120 | CX25840_SVIDEO_ON, |
| 121 | .amux = CX231XX_AMUX_LINE_IN, | 121 | .amux = CX231XX_AMUX_LINE_IN, |
| 122 | .gpio = 0, | 122 | .gpio = NULL, |
| 123 | } | 123 | } |
| 124 | }, | 124 | }, |
| 125 | }, | 125 | }, |
| @@ -147,19 +147,19 @@ struct cx231xx_board cx231xx_boards[] = { | |||
| 147 | .type = CX231XX_VMUX_TELEVISION, | 147 | .type = CX231XX_VMUX_TELEVISION, |
| 148 | .vmux = CX231XX_VIN_3_1, | 148 | .vmux = CX231XX_VIN_3_1, |
| 149 | .amux = CX231XX_AMUX_VIDEO, | 149 | .amux = CX231XX_AMUX_VIDEO, |
| 150 | .gpio = 0, | 150 | .gpio = NULL, |
| 151 | }, { | 151 | }, { |
| 152 | .type = CX231XX_VMUX_COMPOSITE1, | 152 | .type = CX231XX_VMUX_COMPOSITE1, |
| 153 | .vmux = CX231XX_VIN_2_1, | 153 | .vmux = CX231XX_VIN_2_1, |
| 154 | .amux = CX231XX_AMUX_LINE_IN, | 154 | .amux = CX231XX_AMUX_LINE_IN, |
| 155 | .gpio = 0, | 155 | .gpio = NULL, |
| 156 | }, { | 156 | }, { |
| 157 | .type = CX231XX_VMUX_SVIDEO, | 157 | .type = CX231XX_VMUX_SVIDEO, |
| 158 | .vmux = CX231XX_VIN_1_1 | | 158 | .vmux = CX231XX_VIN_1_1 | |
| 159 | (CX231XX_VIN_1_2 << 8) | | 159 | (CX231XX_VIN_1_2 << 8) | |
| 160 | CX25840_SVIDEO_ON, | 160 | CX25840_SVIDEO_ON, |
| 161 | .amux = CX231XX_AMUX_LINE_IN, | 161 | .amux = CX231XX_AMUX_LINE_IN, |
| 162 | .gpio = 0, | 162 | .gpio = NULL, |
| 163 | } | 163 | } |
| 164 | }, | 164 | }, |
| 165 | }, | 165 | }, |