diff options
| author | Michael Krufky <mkrufky@linuxtv.org> | 2006-10-16 15:07:51 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-12-10 05:50:54 -0500 |
| commit | 5b26c82f959e72cbd642ef4039a356ff8385cd58 (patch) | |
| tree | 6c8349f42c4368aae9221e5ae24247c1d76202e9 | |
| parent | 5b9ed286759eb1c805f344398ee2c57191d7e2bd (diff) | |
V4L/DVB (4756): Cx88: cleanups
- fixed whitespace, replaced leading spaces with tabs
- moved .mpeg descriptor below input settings
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| -rw-r--r-- | drivers/media/video/cx88/cx88-cards.c | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c index 1c5db2070a6e..35979933cd0c 100644 --- a/drivers/media/video/cx88/cx88-cards.c +++ b/drivers/media/video/cx88/cx88-cards.c | |||
| @@ -786,7 +786,6 @@ struct cx88_board cx88_boards[] = { | |||
| 786 | .tuner_addr = ADDR_UNSET, | 786 | .tuner_addr = ADDR_UNSET, |
| 787 | .radio_addr = ADDR_UNSET, | 787 | .radio_addr = ADDR_UNSET, |
| 788 | .tda9887_conf = TDA9887_PRESENT, | 788 | .tda9887_conf = TDA9887_PRESENT, |
| 789 | .mpeg = CX88_MPEG_BLACKBIRD, | ||
| 790 | .input = {{ | 789 | .input = {{ |
| 791 | .type = CX88_VMUX_COMPOSITE1, | 790 | .type = CX88_VMUX_COMPOSITE1, |
| 792 | .vmux = 0, | 791 | .vmux = 0, |
| @@ -805,6 +804,7 @@ struct cx88_board cx88_boards[] = { | |||
| 805 | .vmux = 2, | 804 | .vmux = 2, |
| 806 | .gpio0 = 0x0000cdf3, | 805 | .gpio0 = 0x0000cdf3, |
| 807 | }, | 806 | }, |
| 807 | .mpeg = CX88_MPEG_BLACKBIRD, | ||
| 808 | }, | 808 | }, |
| 809 | [CX88_BOARD_KWORLD_VSTREAM_EXPERT_DVD] = { | 809 | [CX88_BOARD_KWORLD_VSTREAM_EXPERT_DVD] = { |
| 810 | /* Alexander Wold <awold@bigfoot.com> */ | 810 | /* Alexander Wold <awold@bigfoot.com> */ |
| @@ -1252,35 +1252,35 @@ struct cx88_board cx88_boards[] = { | |||
| 1252 | .gpio0 = 0x070b, | 1252 | .gpio0 = 0x070b, |
| 1253 | }}, | 1253 | }}, |
| 1254 | }, | 1254 | }, |
| 1255 | [CX88_BOARD_TE_DTV_250_OEM_SWANN] = { | 1255 | [CX88_BOARD_TE_DTV_250_OEM_SWANN] = { |
| 1256 | .name = "Shenzhen Tungsten Ages Tech TE-DTV-250 / Swann OEM", | 1256 | .name = "Shenzhen Tungsten Ages Tech TE-DTV-250 / Swann OEM", |
| 1257 | .tuner_type = TUNER_LG_PAL_NEW_TAPC, | 1257 | .tuner_type = TUNER_LG_PAL_NEW_TAPC, |
| 1258 | .radio_type = UNSET, | 1258 | .radio_type = UNSET, |
| 1259 | .tuner_addr = ADDR_UNSET, | 1259 | .tuner_addr = ADDR_UNSET, |
| 1260 | .radio_addr = ADDR_UNSET, | 1260 | .radio_addr = ADDR_UNSET, |
| 1261 | .input = {{ | 1261 | .input = {{ |
| 1262 | .type = CX88_VMUX_TELEVISION, | 1262 | .type = CX88_VMUX_TELEVISION, |
| 1263 | .vmux = 0, | 1263 | .vmux = 0, |
| 1264 | .gpio0 = 0x003fffff, | 1264 | .gpio0 = 0x003fffff, |
| 1265 | .gpio1 = 0x00e00000, | 1265 | .gpio1 = 0x00e00000, |
| 1266 | .gpio2 = 0x003fffff, | 1266 | .gpio2 = 0x003fffff, |
| 1267 | .gpio3 = 0x02000000, | 1267 | .gpio3 = 0x02000000, |
| 1268 | },{ | 1268 | },{ |
| 1269 | .type = CX88_VMUX_COMPOSITE1, | 1269 | .type = CX88_VMUX_COMPOSITE1, |
| 1270 | .vmux = 1, | 1270 | .vmux = 1, |
| 1271 | .gpio0 = 0x003fffff, | 1271 | .gpio0 = 0x003fffff, |
| 1272 | .gpio1 = 0x00e00000, | 1272 | .gpio1 = 0x00e00000, |
| 1273 | .gpio2 = 0x003fffff, | 1273 | .gpio2 = 0x003fffff, |
| 1274 | .gpio3 = 0x02000000, | 1274 | .gpio3 = 0x02000000, |
| 1275 | },{ | 1275 | },{ |
| 1276 | .type = CX88_VMUX_SVIDEO, | 1276 | .type = CX88_VMUX_SVIDEO, |
| 1277 | .vmux = 2, | 1277 | .vmux = 2, |
| 1278 | .gpio0 = 0x003fffff, | 1278 | .gpio0 = 0x003fffff, |
| 1279 | .gpio1 = 0x00e00000, | 1279 | .gpio1 = 0x00e00000, |
| 1280 | .gpio2 = 0x003fffff, | 1280 | .gpio2 = 0x003fffff, |
| 1281 | .gpio3 = 0x02000000, | 1281 | .gpio3 = 0x02000000, |
| 1282 | }}, | 1282 | }}, |
| 1283 | }, | 1283 | }, |
| 1284 | [CX88_BOARD_HAUPPAUGE_HVR1300] = { | 1284 | [CX88_BOARD_HAUPPAUGE_HVR1300] = { |
| 1285 | .name = "Hauppauge WinTV-HVR1300 DVB-T/Hybrid MPEG Encoder", | 1285 | .name = "Hauppauge WinTV-HVR1300 DVB-T/Hybrid MPEG Encoder", |
| 1286 | .tuner_type = TUNER_PHILIPS_FMD1216ME_MK3, | 1286 | .tuner_type = TUNER_PHILIPS_FMD1216ME_MK3, |