Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux...

[sfrench/cifs-2.6.git] / drivers / media / video / ovcamchip / ovcamchip_priv.h

diff --git a/drivers/media/video/ovcamchip/ovcamchip_priv.h b/drivers/media/video/ovcamchip/ovcamchip_priv.h
index 50c7763d44b3cad08799299a9f46c2f3839be43c..9afa4fe47726011f4e78edb87fd97095d3410c35 100644 (file)
--- a/drivers/media/video/ovcamchip/ovcamchip_priv.h
+++ b/drivers/media/video/ovcamchip/ovcamchip_priv.h
@@ -24,11 +24,11 @@ extern int ovcamchip_debug;
 
 #define PDEBUG(level, fmt, args...) \
        if (ovcamchip_debug >= (level)) pr_debug("[%s:%d] " fmt "\n", \
-               __FUNCTION__, __LINE__ , ## args)
+               __func__, __LINE__ , ## args)
 
 #define DDEBUG(level, dev, fmt, args...) \
        if (ovcamchip_debug >= (level)) dev_dbg(dev, "[%s:%d] " fmt "\n", \
-               __FUNCTION__, __LINE__ , ## args)
+               __func__, __LINE__ , ## args)
 
 /* Number of times to retry chip detection. Increase this if you are getting
  * "Failed to init camera chip" */