linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / linux / ppp_defs.h

diff --git a/include/linux/ppp_defs.h b/include/linux/ppp_defs.h
index c6b13ff..402056c 100644 (file)
--- a/include/linux/ppp_defs.h
+++ b/include/linux/ppp_defs.h
@@ -42,6 +42,8 @@
 #ifndef _PPP_DEFS_H_
 #define _PPP_DEFS_H_
 
+#include <linux/crc-ccitt.h>
+
 /*
  * The basic PPP frame.
  */
@@ -95,11 +97,7 @@
 
 #define PPP_INITFCS    0xffff  /* Initial FCS value */
 #define PPP_GOODFCS    0xf0b8  /* Good final FCS value */
-
-#ifdef __KERNEL__
-#include <linux/crc-ccitt.h>
 #define PPP_FCS(fcs, c) crc_ccitt_byte(fcs, c)
-#endif
 
 /*
  * Extended asyncmap - allows any character to be escaped.
@@ -181,4 +179,12 @@ struct ppp_idle {
     time_t recv_idle;          /* time since last NP packet received */
 };
 
+#ifndef __P
+#ifdef __STDC__
+#define __P(x) x
+#else
+#define __P(x) ()
+#endif
+#endif
+
 #endif /* _PPP_DEFS_H_ */