Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-drm-fsl-dcu.git] / net / tipc / cluster.h

diff --git a/net/tipc/cluster.h b/net/tipc/cluster.h
index 9963642e105833dbfb05ac4cff0b2f9bfac5626a..62df074afaecf8a5912b5b9a25a0779a391b8da8 100644 (file)
--- a/net/tipc/cluster.h
+++ b/net/tipc/cluster.h
@@ -1,6 +1,6 @@
 /*
  * net/tipc/cluster.h: Include file for TIPC cluster management routines
- * 
+ *
  * Copyright (c) 2000-2006, Ericsson AB
  * Copyright (c) 2005, Wind River Systems
  * All rights reserved.
@@ -50,7 +50,7 @@
  * @highest_node: id of highest numbered node within cluster
  * @highest_slave: (used for secondary node support)
  */
- 
+
 struct cluster {
        u32 addr;
        struct _zone *owner;
@@ -86,7 +86,7 @@ static inline struct cluster *tipc_cltr_find(u32 addr)
 
        if (z_ptr)
                return z_ptr->clusters[1];
-       return 0;
+       return NULL;
 }
 
 #endif