From 667c2ce06903abeb921920eb9c567b4fa4816146 Mon Sep 17 00:00:00 2001
From: Hannes Eder <hannes@hanneseder.net>
Date: Thu, 25 Dec 2008 23:56:45 -0800
Subject: [PATCH] --- yaml --- r: 122901 b: refs/heads/master c:
 dac499f912abd5838fa3501efdcd0f23d5f4fc29 h: refs/heads/master i:   122899:
 defba0d1829e986d7142f4459d114c715b37cd3d v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/net/3c523.c   | 2 +-
 trunk/drivers/net/cs89x0.c  | 2 +-
 trunk/drivers/net/eepro.c   | 2 +-
 trunk/drivers/net/plip.c    | 4 ++--
 trunk/drivers/net/s2io.c    | 2 +-
 trunk/drivers/net/smc9194.c | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 58c50768ee71..d8591025600d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a08b32df1417146b1a4c43e641ec1177da51896c
+refs/heads/master: dac499f912abd5838fa3501efdcd0f23d5f4fc29
diff --git a/trunk/drivers/net/3c523.c b/trunk/drivers/net/3c523.c
index d9c9481a59a5..ff41e1ff5603 100644
--- a/trunk/drivers/net/3c523.c
+++ b/trunk/drivers/net/3c523.c
@@ -347,7 +347,7 @@ static int __init check586(struct net_device *dev, unsigned long where, unsigned
  * set iscp at the right place, called by elmc_probe and open586.
  */
 
-void alloc586(struct net_device *dev)
+static void alloc586(struct net_device *dev)
 {
 	struct priv *p = netdev_priv(dev);
 
diff --git a/trunk/drivers/net/cs89x0.c b/trunk/drivers/net/cs89x0.c
index b063395c4a96..d548a45d59d5 100644
--- a/trunk/drivers/net/cs89x0.c
+++ b/trunk/drivers/net/cs89x0.c
@@ -1030,7 +1030,7 @@ dma_rx(struct net_device *dev)
 
 #endif	/* ALLOW_DMA */
 
-void  __init reset_chip(struct net_device *dev)
+static void __init reset_chip(struct net_device *dev)
 {
 #if !defined(CONFIG_MACH_MX31ADS)
 #if !defined(CONFIG_MACH_IXDP2351) && !defined(CONFIG_ARCH_IXDP2X01)
diff --git a/trunk/drivers/net/eepro.c b/trunk/drivers/net/eepro.c
index 0a984619411b..e187c88ae145 100644
--- a/trunk/drivers/net/eepro.c
+++ b/trunk/drivers/net/eepro.c
@@ -1395,7 +1395,7 @@ set_multicast_list(struct net_device *dev)
 #define eeprom_delay() { udelay(40); }
 #define EE_READ_CMD (6 << 6)
 
-int
+static int
 read_eeprom(int ioaddr, int location, struct net_device *dev)
 {
 	int i;
diff --git a/trunk/drivers/net/plip.c b/trunk/drivers/net/plip.c
index ed8582ea7e54..0c46d603b8fe 100644
--- a/trunk/drivers/net/plip.c
+++ b/trunk/drivers/net/plip.c
@@ -1017,8 +1017,8 @@ plip_hard_header(struct sk_buff *skb, struct net_device *dev,
 	return ret;
 }
 
-int plip_hard_header_cache(const struct neighbour *neigh,
-                           struct hh_cache *hh)
+static int plip_hard_header_cache(const struct neighbour *neigh,
+				  struct hh_cache *hh)
 {
 	int ret;
 
diff --git a/trunk/drivers/net/s2io.c b/trunk/drivers/net/s2io.c
index 512861923c6b..748b4cb3a58a 100644
--- a/trunk/drivers/net/s2io.c
+++ b/trunk/drivers/net/s2io.c
@@ -5113,7 +5113,7 @@ static void s2io_set_multicast(struct net_device *dev)
 /* read from CAM unicast & multicast addresses and store it in
  * def_mac_addr structure
  */
-void do_s2io_store_unicast_mc(struct s2io_nic *sp)
+static void do_s2io_store_unicast_mc(struct s2io_nic *sp)
 {
 	int offset;
 	u64 mac_addr = 0x0;
diff --git a/trunk/drivers/net/smc9194.c b/trunk/drivers/net/smc9194.c
index e7cc80f32560..18d653bbd4e0 100644
--- a/trunk/drivers/net/smc9194.c
+++ b/trunk/drivers/net/smc9194.c
@@ -764,7 +764,7 @@ struct net_device * __init smc_init(int unit)
  . interrupt, so an auto-detect routine can detect it, and find the IRQ,
  ------------------------------------------------------------------------
 */
-int __init smc_findirq( int ioaddr )
+static int __init smc_findirq(int ioaddr)
 {
 #ifndef NO_AUTOPROBE
 	int	timeout = 20;