diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-01-15 18:01:27 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-01-15 18:01:27 -0500 |
| commit | d04ae27bae42bcce1b3fa70ca2edf25d92b1cf39 (patch) | |
| tree | 1bf8070b7cff7a5f1375a141c51edcd92e3e3c6a /drivers/media/video/tvp5150.c | |
| parent | f1dccedc8148026d9071c6805f7cb77374a9e56f (diff) | |
| parent | e0ad8486266c3415ab9c17f5c03c47edc7b93d7b (diff) | |
Merge branch 'work'
Diffstat (limited to 'drivers/media/video/tvp5150.c')
| -rw-r--r-- | drivers/media/video/tvp5150.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/tvp5150.c b/drivers/media/video/tvp5150.c index 9094fa9f2ecb..fad9ea0ae4f2 100644 --- a/drivers/media/video/tvp5150.c +++ b/drivers/media/video/tvp5150.c | |||
| @@ -634,7 +634,7 @@ struct i2c_vbi_ram_value { | |||
| 634 | unsigned char values[26]; | 634 | unsigned char values[26]; |
| 635 | }; | 635 | }; |
| 636 | 636 | ||
| 637 | struct i2c_vbi_ram_value vbi_ram_default[] = | 637 | static struct i2c_vbi_ram_value vbi_ram_default[] = |
| 638 | { | 638 | { |
| 639 | {0x010, /* WST SECAM 6 */ | 639 | {0x010, /* WST SECAM 6 */ |
| 640 | { 0xaa, 0xaa, 0xff, 0xff , 0xe7, 0x2e, 0x20, 0x26, 0xe6, 0xb4, 0x0e, 0x0, 0x0, 0x0, 0x10, 0x0 } | 640 | { 0xaa, 0xaa, 0xff, 0xff , 0xe7, 0x2e, 0x20, 0x26, 0xe6, 0xb4, 0x0e, 0x0, 0x0, 0x0, 0x10, 0x0 } |