From 6d403070f28cd44860fdb3a53be5da0275c65cf4 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Mon, 19 Jun 2000 22:45:37 +0000
Subject: Merge with 2.4.0-test1-ac21 + pile of MIPS cleanups to make merging
 possible.  Chainsawed RM200 kernel to compile again.  Jazz machine status
 unknown.

---
 net/bridge/br.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'net/bridge')

diff --git a/net/bridge/br.c b/net/bridge/br.c
index bbbd53a60..a569c0c97 100644
--- a/net/bridge/br.c
+++ b/net/bridge/br.c
@@ -5,7 +5,7 @@
  *	Authors:
  *	Lennert Buytenhek		<buytenh@gnu.org>
  *
- *	$Id: br.c,v 1.42 2000/04/14 10:10:34 davem Exp $
+ *	$Id: br.c,v 1.43 2000/05/25 02:21:36 davem Exp $
  *
  *	This program is free software; you can redistribute it and/or
  *	modify it under the terms of the GNU General Public License
@@ -38,7 +38,7 @@ void br_inc_use_count()
 	MOD_INC_USE_COUNT;
 }
 
-static int __init br_init(void)
+int __init br_init(void)
 {
 	printk(KERN_INFO "NET4: Ethernet Bridge 008 for NET4.0\n");
 
-- 
cgit v1.2.3