diff options
author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/media/dvb/ttpci/budget-patch.c | |
parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'drivers/media/dvb/ttpci/budget-patch.c')
-rw-r--r-- | drivers/media/dvb/ttpci/budget-patch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb/ttpci/budget-patch.c b/drivers/media/dvb/ttpci/budget-patch.c index 579835590690..3395d1a90516 100644 --- a/drivers/media/dvb/ttpci/budget-patch.c +++ b/drivers/media/dvb/ttpci/budget-patch.c | |||
@@ -539,7 +539,7 @@ static int budget_patch_attach (struct saa7146_dev* dev, struct saa7146_pci_exte | |||
539 | ** increment. That's how the 7146 is programmed to do event | 539 | ** increment. That's how the 7146 is programmed to do event |
540 | ** counting in this budget-patch.c | 540 | ** counting in this budget-patch.c |
541 | ** I *think* HPS setting has something to do with the phase | 541 | ** I *think* HPS setting has something to do with the phase |
542 | ** of HS but I cant be 100% sure in that. | 542 | ** of HS but I can't be 100% sure in that. |
543 | 543 | ||
544 | ** hardware debug note: a working budget card (including budget patch) | 544 | ** hardware debug note: a working budget card (including budget patch) |
545 | ** with vpeirq() interrupt setup in mode "0x90" (every 64K) will | 545 | ** with vpeirq() interrupt setup in mode "0x90" (every 64K) will |