summaryrefslogtreecommitdiff
path: root/net/atm/protocols.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-03-25 22:39:45 -0800
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-03-25 22:39:45 -0800
commitc01debcd72ff37dbd87de54d5f0a1d753092775f (patch)
treea14e17c2e368eaae70ce21d0d3c88d419b1183d4 /net/atm/protocols.h
parentd506d2b66af72403912db434453c5e5a31c0b2d3 (diff)
parent651b6a34392167cd0310869cbc0341f91ba4d956 (diff)
Merge bk://kernel.bkbits.net/davem/net-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'net/atm/protocols.h')
-rw-r--r--net/atm/protocols.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/net/atm/protocols.h b/net/atm/protocols.h
index 0d658fa8a611..acdfc856222d 100644
--- a/net/atm/protocols.h
+++ b/net/atm/protocols.h
@@ -6,8 +6,6 @@
#ifndef NET_ATM_PROTOCOLS_H
#define NET_ATM_PROTOCOLS_H
-void atm_push_raw(struct atm_vcc *vcc,struct sk_buff *skb);
-
int atm_init_aal0(struct atm_vcc *vcc); /* "raw" AAL0 */
int atm_init_aal34(struct atm_vcc *vcc);/* "raw" AAL3/4 transport */
int atm_init_aal5(struct atm_vcc *vcc); /* "raw" AAL5 transport */