netfilter: nf_conntrack: pass template to l4proto ->error() handler

[safe/jmp/linux-2.6] / include / linux / ppp_defs.h

diff --git a/include/linux/ppp_defs.h b/include/linux/ppp_defs.h
index c6b13ff..0f93ed6 100644 (file)
--- a/include/linux/ppp_defs.h
+++ b/include/linux/ppp_defs.h
@@ -1,5 +1,3 @@
-/*     $Id: ppp_defs.h,v 1.2 1994/09/21 01:31:06 paulus Exp $  */
-
 /*
  * ppp_defs.h - PPP definitions.
  *
@@ -27,6 +25,8 @@
  * OR MODIFICATIONS.
  */
 
+#include <linux/types.h>
+
 /*
  *  ==FILEVERSION 20000114==
  *
@@ -177,8 +177,8 @@ struct ppp_comp_stats {
  * the last NP packet was sent or received.
  */
 struct ppp_idle {
-    time_t xmit_idle;          /* time since last NP packet sent */
-    time_t recv_idle;          /* time since last NP packet received */
+    __kernel_time_t xmit_idle; /* time since last NP packet sent */
+    __kernel_time_t recv_idle; /* time since last NP packet received */
 };
 
 #endif /* _PPP_DEFS_H_ */