Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 235714
b: refs/heads/master
c: 5673db4
h: refs/heads/master
v: v3
  • Loading branch information
L. Alberto Giménez authored and Greg Kroah-Hartman committed Jan 25, 2011
1 parent 448a322 commit 5f933ef
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f5041dac6ba543a98bf550ae94923fc8e9d4fc13
refs/heads/master: 5673db40e28732431b1d3c6433638408f913142e
3 changes: 1 addition & 2 deletions trunk/drivers/staging/rt2860/rt_linux.c
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,7 @@ void RTMP_OS_Mod_Timer(struct timer_list *pTimer,
mod_timer(pTimer, jiffies + timeout);
}

void RTMP_OS_Del_Timer(struct timer_list *pTimer,
OUT BOOLEAN * pCancelled)
void RTMP_OS_Del_Timer(struct timer_list *pTimer, OUT BOOLEAN *pCancelled)
{
if (timer_pending(pTimer)) {
*pCancelled = del_timer_sync(pTimer);
Expand Down

0 comments on commit 5f933ef

Please sign in to comment.