diff options
author | Kumar Gala <galak@kernel.crashing.org> | 2007-02-12 23:52:26 -0600 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2007-02-12 23:52:26 -0600 |
commit | 7baca6ad0ef09c8a78d798c93a3ce25336e8f50f (patch) | |
tree | f3dd43243be6e840dc2b0386e91c4146a4f51620 /net/tipc/net.h | |
parent | 06d8bf64ba25db42fcc60d2da2268ac22af94e77 (diff) | |
parent | 17e0e27020d028a790d97699aff85a43af5be472 (diff) | |
download | kernel-crypto-7baca6ad0ef09c8a78d798c93a3ce25336e8f50f.tar.gz kernel-crypto-7baca6ad0ef09c8a78d798c93a3ce25336e8f50f.tar.xz kernel-crypto-7baca6ad0ef09c8a78d798c93a3ce25336e8f50f.zip |
Merge branch 'master' into for_paulus
Diffstat (limited to 'net/tipc/net.h')
-rw-r--r-- | net/tipc/net.h | 4 |
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; }; |