diff options
| author | Len Brown <len.brown@intel.com> | 2009-04-05 02:14:15 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-04-05 02:14:15 -0400 |
| commit | 478c6a43fcbc6c11609f8cee7c7b57223907754f (patch) | |
| tree | a7f7952099da60d33032aed6de9c0c56c9f8779e /net/tipc/bcast.h | |
| parent | 8a3f257c704e02aee9869decd069a806b45be3f1 (diff) | |
| parent | 6bb597507f9839b13498781e481f5458aea33620 (diff) | |
Merge branch 'linus' into release
Conflicts:
arch/x86/kernel/cpu/cpufreq/longhaul.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'net/tipc/bcast.h')
| -rw-r--r-- | net/tipc/bcast.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/bcast.h b/net/tipc/bcast.h index 2f2d731bc1c2..4c1771e95c99 100644 --- a/net/tipc/bcast.h +++ b/net/tipc/bcast.h | |||
| @@ -70,7 +70,7 @@ struct port_list { | |||
| 70 | 70 | ||
| 71 | struct tipc_node; | 71 | struct tipc_node; |
| 72 | 72 | ||
| 73 | extern char tipc_bclink_name[]; | 73 | extern const char tipc_bclink_name[]; |
| 74 | 74 | ||
| 75 | 75 | ||
| 76 | /** | 76 | /** |