diff options
| author | Roland McGrath <roland@gnu.org> | 2000-02-05 12:13:22 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2000-02-05 12:13:22 +0000 |
| commit | 1a7ccb577c414677f9e763036d6ccce3a298f16d (patch) | |
| tree | 10f45d0745e0f65108ecbda92ed6f7214dc703ff /pfinet/linux-src/include/linux/isdn_ppp.h | |
| parent | add1cad493c256d0a7c939070f9ee067c2718daf (diff) | |
| parent | b39cd08347c72483a4521a55301a0fa147a2a2b1 (diff) | |
Merge from vendor branch Linux:
Import of Linux 2.2.13 subset (ipv4 stack and related)
Diffstat (limited to 'pfinet/linux-src/include/linux/isdn_ppp.h')
| -rw-r--r-- | pfinet/linux-src/include/linux/isdn_ppp.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/pfinet/linux-src/include/linux/isdn_ppp.h b/pfinet/linux-src/include/linux/isdn_ppp.h index a62101d0..06d71797 100644 --- a/pfinet/linux-src/include/linux/isdn_ppp.h +++ b/pfinet/linux-src/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_struct { 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; |