Merge git://tipc.cslab.ericsson.net/pub/git/tipc

[linux-2.6] / net / tipc / eth_media.c

diff --git a/net/tipc/eth_media.c b/net/tipc/eth_media.c
index cb507c4b7e6e8bf168bb5fdf97917611864f7fca..1f8d83b9c8b46440e1ad8bbce9f0fd61385bfef2 100644 (file)
--- a/net/tipc/eth_media.c
+++ b/net/tipc/eth_media.c
@@ -238,13 +238,13 @@ static char *eth_addr2str(struct tipc_media_addr *a, char *str_buf, int str_size
 }
 
 /**
- * eth_media_start - activate Ethernet bearer support
+ * tipc_eth_media_start - activate Ethernet bearer support
  *
  * Register Ethernet media type with TIPC bearer code.  Also register
  * with OS for notifications about device state changes.
  */
 
-int eth_media_start(void)
+int tipc_eth_media_start(void)
 {                       
        struct tipc_media_addr bcast_addr;
        int res;
@@ -271,10 +271,10 @@ int eth_media_start(void)
 }
 
 /**
- * eth_media_stop - deactivate Ethernet bearer support
+ * tipc_eth_media_stop - deactivate Ethernet bearer support
  */
 
-void eth_media_stop(void)
+void tipc_eth_media_stop(void)
 {
        int i;