From 291a635a3eea22654b8c923acb728e70c6bd6d99 Mon Sep 17 00:00:00 2001
From: Andre Haupt <andre@bitwigglers.org>
Date: Mon, 26 Jan 2009 16:12:24 +0100
Subject: [PATCH] --- yaml --- r: 141229 b: refs/heads/master c:
 f02d3345edcf0db86a98e229a4441c2b60b42f7e h: refs/heads/master i:   141227:
 a70a440b9832667de0edba54898b1eda8df43b3c v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/staging/me4000/me4000.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 85d970d08d91..905d5166c1b1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 370eb29dc441fb67a0175cc04134d13202b09c7d
+refs/heads/master: f02d3345edcf0db86a98e229a4441c2b60b42f7e
diff --git a/trunk/drivers/staging/me4000/me4000.c b/trunk/drivers/staging/me4000/me4000.c
index be8ffefb9c35..2c448b44b381 100644
--- a/trunk/drivers/staging/me4000/me4000.c
+++ b/trunk/drivers/staging/me4000/me4000.c
@@ -2205,7 +2205,7 @@ static int me4000_ao_ioctl_sing(struct inode *inode_p, struct file *file_p,
 	case ME4000_AO_SIMULTANEOUS_UPDATE:
 		return
 		    me4000_ao_simultaneous_update(
-		    		(struct me4000_ao_channel_list *)arg,
+				(struct me4000_ao_channel_list *)arg,
 				ao_context);
 	case ME4000_AO_EX_TRIG_TIMEOUT:
 		return me4000_ao_ex_trig_timeout((unsigned long *)arg,
@@ -2681,11 +2681,11 @@ static int me4000_ao_preload_update(struct me4000_ao_context *ao_context)
 			    (tmp &
 			     (0x1 <<
 			      (((struct me4000_ao_context *)entry)->index
-			      					      + 16)))) {
+								      + 16)))) {
 				tmp &=
 				    ~(0x1 <<
 				      (((struct me4000_ao_context *)entry)->
-				      					index));
+									index));
 			}
 		}
 	}