diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-23 00:40:54 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-23 00:40:54 +0000 |
| commit | 529c593ece216e4aaffd36bd940cb94f1fa63129 (patch) | |
| tree | 78f1c0b805f5656aa7b0417a043c5346f700a2cf /net/atm/signaling.h | |
| parent | 0bd079751d25808d1972baee5c4eaa1db2227257 (diff) | |
Merge with 2.3.43. I did ignore all modifications to the qlogicisp.c
driver due to the Origin A64 hacks.
Diffstat (limited to 'net/atm/signaling.h')
| -rw-r--r-- | net/atm/signaling.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/atm/signaling.h b/net/atm/signaling.h index 117e8431e..dbb8c21e1 100644 --- a/net/atm/signaling.h +++ b/net/atm/signaling.h @@ -1,6 +1,6 @@ /* net/atm/signaling.h - ATM signaling */ -/* Written 1995-1999 by Werner Almesberger, EPFL LRC/ICA */ +/* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */ #ifndef NET_ATM_SIGNALING_H @@ -18,7 +18,7 @@ extern struct atm_vcc *sigd; /* needed in svc_release */ void sigd_enq(struct atm_vcc *vcc,enum atmsvc_msg_type type, - const struct atm_vcc *listen_vcc,const struct sockaddr_atmpvc *pvc, + struct atm_vcc *listen_vcc,const struct sockaddr_atmpvc *pvc, const struct sockaddr_atmsvc *svc); int sigd_attach(struct atm_vcc *vcc); void signaling_init(void); |