Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-3.6

[karo-tx-linux.git] / net / caif / caif_config_util.c

diff --git a/net/caif/caif_config_util.c b/net/caif/caif_config_util.c
index d522d8c1703e761eb27b4e2375eff9851b06690e..9b63e4e3910ed835c5b73bcd1d863104aad57a58 100644 (file)
--- a/net/caif/caif_config_util.c
+++ b/net/caif/caif_config_util.c
@@ -10,9 +10,9 @@
 #include <net/caif/cfcnfg.h>
 #include <net/caif/caif_dev.h>
 
-int connect_req_to_link_param(struct cfcnfg *cnfg,
-                               struct caif_connect_request *s,
-                               struct cfctrl_link_param *l)
+int caif_connect_req_to_link_param(struct cfcnfg *cnfg,
+                                  struct caif_connect_request *s,
+                                  struct cfctrl_link_param *l)
 {
        struct dev_info *dev_info;
        enum cfcnfg_phy_preference pref;