diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-02-07 17:43:08 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-02-07 17:43:08 -0500 |
| commit | 8f75015f33c3005e0bbf83ffc0d5e0b4262cc03d (patch) | |
| tree | a3c34ad86ccdc904bb43af6cd1cb163231c29276 /drivers/media/video/hexium_orion.c | |
| parent | 076d022c566fddde41fd4a858dd24bacad8304d7 (diff) | |
| parent | e060e084e7d9e1c62d02cb6b8d3fe07db5317eaa (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
Diffstat (limited to 'drivers/media/video/hexium_orion.c')
| -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], |