summaryrefslogtreecommitdiffstats
path: root/net/tipc/net.h
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2007-02-12 23:57:21 -0600
committerKumar Gala <galak@kernel.crashing.org>2007-02-12 23:57:21 -0600
commit54c66f6d781e03dc0b23956234963c4911e6d1c0 (patch)
tree40619a66ae6d8703a57bf681d087ffeabbffd346 /net/tipc/net.h
parent8ce0a7df6e6117d8814e976d4b7ce6a6b2c9cf93 (diff)
parent17e0e27020d028a790d97699aff85a43af5be472 (diff)
downloadkernel-crypto-54c66f6d781e03dc0b23956234963c4911e6d1c0.tar.gz
kernel-crypto-54c66f6d781e03dc0b23956234963c4911e6d1c0.tar.xz
kernel-crypto-54c66f6d781e03dc0b23956234963c4911e6d1c0.zip
Merge branch 'master' into 85xx
Diffstat (limited to 'net/tipc/net.h')
-rw-r--r--net/tipc/net.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/tipc/net.h b/net/tipc/net.h
index f3e0b85e647..a6a0e9976ac 100644
--- a/net/tipc/net.h
+++ b/net/tipc/net.h
@@ -1,6 +1,6 @@
/*
* net/tipc/net.h: Include file for TIPC network routing code
- *
+ *
* Copyright (c) 1995-2006, Ericsson AB
* Copyright (c) 2005, Wind River Systems
* All rights reserved.
@@ -43,7 +43,7 @@ struct _zone;
* struct network - TIPC network structure
* @zones: array of pointers to all zones within network
*/
-
+
struct network {
struct _zone **zones;
};