patch-2.2.13 linux/include/linux/isdn_ppp.h

Next file: linux/include/linux/isdnif.h
Previous file: linux/include/linux/isdn_compat.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.2.12/linux/include/linux/isdn_ppp.h linux/include/linux/isdn_ppp.h
@@ -3,7 +3,7 @@
 #ifndef _LINUX_ISDN_PPP_H
 #define _LINUX_ISDN_PPP_H
 
-#include <linux/isdn_compat.h>
+#include <linux/config.h>
 
 #define CALLTYPE_INCOMING 0x1
 #define CALLTYPE_OUTGOING 0x2
@@ -206,11 +206,7 @@
   struct ippp_buf_queue rq[NUM_RCV_BUFFS]; /* packet queue for isdn_ppp_read() */
   struct ippp_buf_queue *first;  /* pointer to (current) first packet */
   struct ippp_buf_queue *last;   /* pointer to (current) last used packet in queue */
-#ifdef COMPAT_HAS_NEW_WAITQ
-  wait_queue_head_t wq;
-#else
   struct wait_queue *wq;
-#endif
   struct task_struct *tk;
   unsigned int mpppcfg;
   unsigned int pppcfg;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)