Merge branch 'linux-2.6' into merge

1 files changed, 1 insertions, 1 deletions

diff --git a/net/dccp/probe.c b/net/dccp/probe.c
index 0bcdc9250279..81368a7f5379 100644
--- a/net/dccp/probe.c
+++ b/net/dccp/probe.c
@@ -42,7 +42,7 @@ static int bufsize = 64 * 1024;
 
 static const char procname[] = "dccpprobe";
 
-struct {
+static struct {
         struct kfifo      *fifo;
         spinlock_t        lock;
         wait_queue_head_t wait;