summaryrefslogtreecommitdiff
path: root/net/atm/mpc.c
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/mpc.c
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/mpc.c')
-rw-r--r--net/atm/mpc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/atm/mpc.c b/net/atm/mpc.c
index 947b0cc4944f..17a81ebe7e6e 100644
--- a/net/atm/mpc.c
+++ b/net/atm/mpc.c
@@ -564,7 +564,7 @@ static int mpc_send_packet(struct sk_buff *skb, struct net_device *dev)
return retval;
}
-int atm_mpoa_vcc_attach(struct atm_vcc *vcc, void __user *arg)
+static int atm_mpoa_vcc_attach(struct atm_vcc *vcc, void __user *arg)
{
int bytes_left;
struct mpoa_client *mpc;
@@ -753,7 +753,7 @@ static struct atm_dev mpc_dev = {
/* members not explicitly initialised will be 0 */
};
-int atm_mpoa_mpoad_attach (struct atm_vcc *vcc, int arg)
+static int atm_mpoa_mpoad_attach (struct atm_vcc *vcc, int arg)
{
struct mpoa_client *mpc;
struct lec_priv *priv;
@@ -1460,7 +1460,7 @@ static __init int atm_mpoa_init(void)
return 0;
}
-void __exit atm_mpoa_cleanup(void)
+static void __exit atm_mpoa_cleanup(void)
{
struct mpoa_client *mpc, *tmp;
struct atm_mpoa_qos *qos, *nextqos;