diff options
| author | Jody McIntyre <scjody@modernduck.com> | 2005-12-05 15:52:41 -0500 |
|---|---|---|
| committer | Jody McIntyre <scjody@modernduck.com> | 2005-12-05 15:52:41 -0500 |
| commit | c4fc108a8275f5eb77c9859725643a6870d20ef6 (patch) | |
| tree | de7ce4af8e49ad2504fc270594124ec8ec874857 /drivers/media/dvb/ttpci/budget-ci.c | |
| parent | 741854e4f9a23421e194df8d846899172ff393d6 (diff) | |
| parent | e4f5c82a92c2a546a16af1614114eec19120e40a (diff) | |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/media/dvb/ttpci/budget-ci.c')
| -rw-r--r-- | drivers/media/dvb/ttpci/budget-ci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb/ttpci/budget-ci.c b/drivers/media/dvb/ttpci/budget-ci.c index 75fb92d60998..b9b3cd9c0369 100644 --- a/drivers/media/dvb/ttpci/budget-ci.c +++ b/drivers/media/dvb/ttpci/budget-ci.c | |||
| @@ -1166,7 +1166,7 @@ MODULE_DEVICE_TABLE(pci, pci_tbl); | |||
| 1166 | 1166 | ||
| 1167 | static struct saa7146_extension budget_extension = { | 1167 | static struct saa7146_extension budget_extension = { |
| 1168 | .name = "budget_ci dvb\0", | 1168 | .name = "budget_ci dvb\0", |
| 1169 | .flags = 0, | 1169 | .flags = SAA7146_I2C_SHORT_DELAY, |
| 1170 | 1170 | ||
| 1171 | .module = THIS_MODULE, | 1171 | .module = THIS_MODULE, |
| 1172 | .pci_tbl = &pci_tbl[0], | 1172 | .pci_tbl = &pci_tbl[0], |