Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb

[sfrench/cifs-2.6.git] / drivers / media / video / usbvision / usbvision-i2c.c

diff --git a/drivers/media/video/usbvision/usbvision-i2c.c b/drivers/media/video/usbvision/usbvision-i2c.c
index a7ed6f21f1195be75bcde536a4afa7c27a45e982..e2274d77ea295a532befda800eec9ab53e14eb0c 100644 (file)
--- a/drivers/media/video/usbvision/usbvision-i2c.c
+++ b/drivers/media/video/usbvision/usbvision-i2c.c
@@ -45,8 +45,10 @@ static int i2c_debug;
 module_param (i2c_debug, int, 0644);                   // debug_i2c_usb mode of the device driver
 MODULE_PARM_DESC(i2c_debug, "enable debug messages [i2c]");
 
-#define PDEBUG(level, fmt, args...) \
-               if (i2c_debug & (level)) info("[%s:%d] " fmt, __PRETTY_FUNCTION__, __LINE__ , ## args)
+#define PDEBUG(level, fmt, args...) { \
+               if (i2c_debug & (level)) \
+                       info("[%s:%d] " fmt, __func__, __LINE__ , ## args); \
+       }
 
 static int usbvision_i2c_write(struct usb_usbvision *usbvision, unsigned char addr, char *buf,
                            short len);