Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / include / net / addrconf.h

diff --git a/include/net/addrconf.h b/include/net/addrconf.h
index a9441249306c4847f6f641ae320110ebd86f3694..23710aa6a181028c83fca3a9a94394b0d9905861 100644 (file)
--- a/include/net/addrconf.h
+++ b/include/net/addrconf.h
@@ -1,8 +1,6 @@
 #ifndef _ADDRCONF_H
 #define _ADDRCONF_H
 
-#define RETRANS_TIMER  HZ
-
 #define MAX_RTR_SOLICITATIONS          3
 #define RTR_SOLICITATION_INTERVAL      (4*HZ)