From 5f933ef36852dec6531c61922cbdef2557187efe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=2E=20Alberto=20Gim=C3=A9nez?= <agimenez@sysvalve.es>
Date: Sun, 23 Jan 2011 01:07:18 +0100
Subject: [PATCH] --- yaml --- r: 235714 b: refs/heads/master c:
 5673db40e28732431b1d3c6433638408f913142e h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/staging/rt2860/rt_linux.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index f7438496e3b8..24aa0ba349dc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f5041dac6ba543a98bf550ae94923fc8e9d4fc13
+refs/heads/master: 5673db40e28732431b1d3c6433638408f913142e
diff --git a/trunk/drivers/staging/rt2860/rt_linux.c b/trunk/drivers/staging/rt2860/rt_linux.c
index 728864e18a18..b3f836de332b 100644
--- a/trunk/drivers/staging/rt2860/rt_linux.c
+++ b/trunk/drivers/staging/rt2860/rt_linux.c
@@ -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);