From 3eafdc2324005c634790497720b00e982f4ff9a4 Mon Sep 17 00:00:00 2001 From: Harvey Harrison Date: Tue, 8 Apr 2008 23:20:00 -0300 Subject: [PATCH] --- yaml --- r: 92614 b: refs/heads/master c: 22cc065bad19b0a19adecdc753ded7a7b0c752fa h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/et61x251/et61x251.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 3993d58b3bb6..01e022ca2f53 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d80e134dc8e7e078248f7966a6884858f7ab185f +refs/heads/master: 22cc065bad19b0a19adecdc753ded7a7b0c752fa diff --git a/trunk/drivers/media/video/et61x251/et61x251.h b/trunk/drivers/media/video/et61x251/et61x251.h index 02c741d8f85a..cc77d144df3c 100644 --- a/trunk/drivers/media/video/et61x251/et61x251.h +++ b/trunk/drivers/media/video/et61x251/et61x251.h @@ -199,7 +199,7 @@ do { \ dev_info(&cam->usbdev->dev, fmt "\n", ## args); \ else if ((level) >= 3) \ dev_info(&cam->usbdev->dev, "[%s:%s:%d] " fmt "\n", \ - __FILE__, __FUNCTION__, __LINE__ , ## args); \ + __FILE__, __func__, __LINE__ , ## args); \ } \ } while (0) # define KDBG(level, fmt, args...) \ @@ -209,7 +209,7 @@ do { \ pr_info("et61x251: " fmt "\n", ## args); \ else if ((level) == 3) \ pr_debug("sn9c102: [%s:%s:%d] " fmt "\n", __FILE__, \ - __FUNCTION__, __LINE__ , ## args); \ + __func__, __LINE__ , ## args); \ } \ } while (0) # define V4LDBG(level, name, cmd) \ @@ -225,7 +225,7 @@ do { \ #undef PDBG #define PDBG(fmt, args...) \ -dev_info(&cam->usbdev->dev, "[%s:%s:%d] " fmt "\n", __FILE__, __FUNCTION__, \ +dev_info(&cam->usbdev->dev, "[%s:%s:%d] " fmt "\n", __FILE__, __func__, \ __LINE__ , ## args) #undef PDBGG