diff --git a/[refs] b/[refs]
index 32b2a1bcbf1c..11e5d8bf26ed 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 95608261dae863bc43292e6fbd946a3abd3aa49f
+refs/heads/master: f20badbe1207bb10a8ad5fdadc2131c94344b5d9
diff --git a/trunk/drivers/net/hamachi.c b/trunk/drivers/net/hamachi.c
index d9df1d9a5739..bc9a3bf8d560 100644
--- a/trunk/drivers/net/hamachi.c
+++ b/trunk/drivers/net/hamachi.c
@@ -204,6 +204,10 @@ KERN_INFO "   Further modifications by Keith Underwood <keithu@parl.clemson.edu>
 
 #define RUN_AT(x) (jiffies + (x))
 
+#ifndef ADDRLEN
+#define ADDRLEN 32
+#endif
+
 /* Condensed bus+endian portability operations. */
 #if ADDRLEN == 64
 #define cpu_to_leXX(addr)	cpu_to_le64(addr)