Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

[linux-2.6-omap-h63xx.git] / net / tipc / ref.h

diff --git a/net/tipc/ref.h b/net/tipc/ref.h
index 6d20006be45b66d4f034aabf6ebd1eb538041ecc..38f3a7f4a78d8dcb8308db0b2ffc9aa2a921ca29 100644 (file)
--- a/net/tipc/ref.h
+++ b/net/tipc/ref.h
@@ -1,6 +1,6 @@
 /*
  * net/tipc/ref.h: Include file for TIPC object registry code
- * 
+ *
  * Copyright (c) 1991-2006, Ericsson AB
  * Copyright (c) 2005, Wind River Systems
  * All rights reserved.
@@ -43,7 +43,7 @@
  * @lock: spinlock controlling access to object
  * @data: reference value associated with object (or link to next unused entry)
  */
- 
+
 struct reference {
        void *object;
        spinlock_t lock;
@@ -96,7 +96,7 @@ static inline void *tipc_ref_lock(u32 ref)
 }
 
 /**
- * tipc_ref_unlock - unlock referenced object 
+ * tipc_ref_unlock - unlock referenced object
  */
 
 static inline void tipc_ref_unlock(u32 ref)
@@ -119,7 +119,7 @@ static inline void tipc_ref_unlock(u32 ref)
 static inline void *tipc_ref_deref(u32 ref)
 {
        if (likely(tipc_ref_table.entries)) {
-               struct reference *r = 
+               struct reference *r =
                        &tipc_ref_table.entries[ref & tipc_ref_table.index_mask];
 
                if (likely(r->data.reference == ref))