Patchwork [net-2.6] CAIF: Fix U5500 compile error for shared memory driver

login
register
mail settings
Submitter sjur.brandeland@stericsson.com
Date Nov. 30, 2010, 7:11 p.m.
Message ID <1291144282-2908-1-git-send-email-sjur.brandeland@stericsson.com>
Download mbox | patch
Permalink /patch/73642/
State Accepted
Delegated to: David Miller
Headers show

Comments

sjur.brandeland@stericsson.com - Nov. 30, 2010, 7:11 p.m.
From: Kim Lilliestierna XX <kim.xx.lilliestierna@stericsson.com>

Rearrange pr_fmt so it compiles.

Signed-off-by: Sjur Braendeland <sjur.brandeland@stericsson.com>
---
 drivers/net/caif/caif_shm_u5500.c |    2 +-
 drivers/net/caif/caif_shmcore.c   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
David Miller - Dec. 8, 2010, 4:40 p.m.
From: sjur.brandeland@stericsson.com
Date: Tue, 30 Nov 2010 20:11:22 +0100

> From: Kim Lilliestierna XX <kim.xx.lilliestierna@stericsson.com>
> 
> Rearrange pr_fmt so it compiles.
> 
> Signed-off-by: Sjur Braendeland <sjur.brandeland@stericsson.com>

Applied, thanks.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/net/caif/caif_shm_u5500.c b/drivers/net/caif/caif_shm_u5500.c
index 1cd90da..32b1c6f 100644
--- a/drivers/net/caif/caif_shm_u5500.c
+++ b/drivers/net/caif/caif_shm_u5500.c
@@ -5,7 +5,7 @@ 
  * License terms: GNU General Public License (GPL) version 2
  */
 
-#define pr_fmt(fmt) KBUILD_MODNAME ":" __func__ "():" fmt
+#define pr_fmt(fmt) KBUILD_MODNAME ":" fmt
 
 #include <linux/version.h>
 #include <linux/init.h>
diff --git a/drivers/net/caif/caif_shmcore.c b/drivers/net/caif/caif_shmcore.c
index 19f9c06..8051116 100644
--- a/drivers/net/caif/caif_shmcore.c
+++ b/drivers/net/caif/caif_shmcore.c
@@ -6,7 +6,7 @@ 
  * License terms: GNU General Public License (GPL) version 2
  */
 
-#define pr_fmt(fmt) KBUILD_MODNAME ":" __func__ "():" fmt
+#define pr_fmt(fmt) KBUILD_MODNAME ":" fmt
 
 #include <linux/spinlock.h>
 #include <linux/sched.h>