diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-02-06 18:43:36 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-02-06 18:43:36 -0500 |
| commit | 6cb6524d90b6e5497e79a1474bdb2f26755d1c02 (patch) | |
| tree | fd475ac8f57a6bd39c976056324d1bc79d11b4c9 /drivers/media | |
| parent | 837e9594fc3cb9a06bddd7ecf66151334a2e13d2 (diff) | |
| parent | 410c05427a69f53851637ccb85c2212131409fbd (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/hexium_orion.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/hexium_orion.c b/drivers/media/video/hexium_orion.c index 0b6c2096ec66..aad4a18aafd6 100644 --- a/drivers/media/video/hexium_orion.c +++ b/drivers/media/video/hexium_orion.c | |||
| @@ -484,7 +484,7 @@ static struct saa7146_ext_vv vv_data = { | |||
| 484 | }; | 484 | }; |
| 485 | 485 | ||
| 486 | static struct saa7146_extension extension = { | 486 | static struct saa7146_extension extension = { |
| 487 | .name = "hexium HV-PCI6/Orion", | 487 | .name = "hexium HV-PCI6 Orion", |
| 488 | .flags = 0, // SAA7146_USE_I2C_IRQ, | 488 | .flags = 0, // SAA7146_USE_I2C_IRQ, |
| 489 | 489 | ||
| 490 | .pci_tbl = &pci_tbl[0], | 490 | .pci_tbl = &pci_tbl[0], |