aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/skfp/ess.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-27 14:55:50 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-27 14:55:50 -0700
commit61cca8c72eb284e80876bafdea057055f6e793e4 (patch)
tree5bb92477b811e64e88c9f0c119acb2c9e9804c91 /drivers/net/skfp/ess.c
parente494f6333bef20fd9d8689062260c5d0136a3ea0 (diff)
parente254e9bff5283aad1af6d74d2a312ee011b84d61 (diff)
Merge 'upstream' branch of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/skfp/ess.c')
-rw-r--r--drivers/net/skfp/ess.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/skfp/ess.c b/drivers/net/skfp/ess.c
index fd39b4b2ef7..62b01328c49 100644
--- a/drivers/net/skfp/ess.c
+++ b/drivers/net/skfp/ess.c
@@ -102,7 +102,7 @@ void ess_timer_poll(struct s_smc *smc);
void ess_para_change(struct s_smc *smc);
int ess_raf_received_pack(struct s_smc *smc, SMbuf *mb, struct smt_header *sm,
int fs);
-int process_bw_alloc(struct s_smc *smc, long int payload, long int overhead);
+static int process_bw_alloc(struct s_smc *smc, long int payload, long int overhead);
/*
@@ -375,7 +375,7 @@ int ess_raf_received_pack(struct s_smc *smc, SMbuf *mb, struct smt_header *sm,
* determines the synchronous bandwidth, set the TSYNC register and the
* mib variables SBAPayload, SBAOverhead and fddiMACT-NEG.
*/
-int process_bw_alloc(struct s_smc *smc, long int payload, long int overhead)
+static int process_bw_alloc(struct s_smc *smc, long int payload, long int overhead)
{
/*
* determine the synchronous bandwidth (sync_bw) in bytes per T-NEG,