Merge branch 'linus' into stackprotector

[karo-tx-linux.git] / net / 802 / tr.c

diff --git a/net/802/tr.c b/net/802/tr.c
index 3f16b1720554ffc147ff634b7f1564d871ab10fb..18c66475d8c39f8cd9c28a4d5ea0a0b5bc84491e 100644 (file)
--- a/net/802/tr.c
+++ b/net/802/tr.c
@@ -76,7 +76,7 @@ static DEFINE_SPINLOCK(rif_lock);
 
 static struct timer_list rif_timer;
 
-int sysctl_tr_rif_timeout = 60*10*HZ;
+static int sysctl_tr_rif_timeout = 60*10*HZ;
 
 static inline unsigned long rif_hash(const unsigned char *addr)
 {