diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-02-20 14:13:30 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-02-20 14:13:30 -0500 |
| commit | 5a84d159061d914c8dd4aa372ac6e9529c2be453 (patch) | |
| tree | 9b08af78085334af44414adafe0096276f8fe0ff /net/tipc/net.h | |
| parent | e80a0e6e7ccdf64575d4384cb4172860422f5b81 (diff) | |
| parent | 7d477a04a619e90ee08724e8f2d8803c6bdfcef8 (diff) | |
Merge ARM fixes
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 f3e0b85e6475..a6a0e9976ac9 100644 --- a/net/tipc/net.h +++ b/net/tipc/net.h | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * net/tipc/net.h: Include file for TIPC network routing code | 2 | * net/tipc/net.h: Include file for TIPC network routing code |
| 3 | * | 3 | * |
| 4 | * Copyright (c) 1995-2006, Ericsson AB | 4 | * Copyright (c) 1995-2006, Ericsson AB |
| 5 | * Copyright (c) 2005, Wind River Systems | 5 | * Copyright (c) 2005, Wind River Systems |
| 6 | * All rights reserved. | 6 | * All rights reserved. |
| @@ -43,7 +43,7 @@ struct _zone; | |||
| 43 | * struct network - TIPC network structure | 43 | * struct network - TIPC network structure |
| 44 | * @zones: array of pointers to all zones within network | 44 | * @zones: array of pointers to all zones within network |
| 45 | */ | 45 | */ |
| 46 | 46 | ||
| 47 | struct network { | 47 | struct network { |
| 48 | struct _zone **zones; | 48 | struct _zone **zones; |
| 49 | }; | 49 | }; |