Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen...

[sfrench/cifs-2.6.git] / drivers / infiniband / hw / nes / nes_utils.c

diff --git a/drivers/infiniband/hw/nes/nes_utils.c b/drivers/infiniband/hw/nes/nes_utils.c
index c4ec6ac634618c7e325c9fbfb42dfa3985572396..f9db07c2717d81e7f4e7eb7ecdcccc20d303f3ed 100644 (file)
--- a/drivers/infiniband/hw/nes/nes_utils.c
+++ b/drivers/infiniband/hw/nes/nes_utils.c
@@ -566,7 +566,7 @@ struct nes_cqp_request *nes_get_cqp_request(struct nes_device *nesdev)
                                cqp_request);
        } else
                printk(KERN_ERR PFX "%s: Could not allocated a CQP request.\n",
-                          __FUNCTION__);
+                          __func__);
 
        return cqp_request;
 }