git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fortglx/39/tip/timers/rtc' of git://git.linaro.org/people/jstultz/linux...
[pandora-kernel.git]
/
drivers
/
media
/
dvb
/
b2c2
/
flexcop-pci.c
diff --git
a/drivers/media/dvb/b2c2/flexcop-pci.c
b/drivers/media/dvb/b2c2/flexcop-pci.c
index
227c020
..
9552540
100644
(file)
--- a/
drivers/media/dvb/b2c2/flexcop-pci.c
+++ b/
drivers/media/dvb/b2c2/flexcop-pci.c
@@
-58,7
+58,7
@@
struct flexcop_pci {
int active_dma1_addr; /* 0 = addr0 of dma1; 1 = addr1 of dma1 */
u32 last_dma1_cur_pos;
int active_dma1_addr; /* 0 = addr0 of dma1; 1 = addr1 of dma1 */
u32 last_dma1_cur_pos;
- /* position of the pointer last time the timer/packet irq occured */
+ /* position of the pointer last time the timer/packet irq occur
r
ed */
int count;
int count_prev;
int stream_problem;
int count;
int count_prev;
int stream_problem;