---

yaml --- r: 113887 b: refs/heads/master c: 26d2e85 h: refs/heads/master i: 113885: 875fc84 113883: 7fda112 113879: 8a8aa58 113871: e5700ed 113855: 9be43e4 v: v3
git-mirror · Oct 12, 2008 · 3639224 · 3639224
1 parent 07de190
commit 3639224
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eb1b27bd86db6f9f73d6db973b18f31790a3d410
+refs/heads/master: 26d2e854bc242f0134a4be7f1eed98129d96d943
diff --git a/trunk/drivers/media/video/cx23885/cx23885-core.c b/trunk/drivers/media/video/cx23885/cx23885-core.c
@@ -1442,7 +1442,7 @@ void cx23885_cancel_buffers(struct cx23885_tsport *port)
 	struct cx23885_dev *dev = port->dev;
 	struct cx23885_dmaqueue *q = &port->mpegq;
 
-	dprintk(1, "%s()\n", __FUNCTION__);
+	dprintk(1, "%s()\n", __func__);
 	del_timer_sync(&q->timeout);
 	cx23885_stop_dma(port);
 	do_cancel_buffers(port, "cancel", 0);

diff --git a/trunk/include/media/saa7146.h b/trunk/include/media/saa7146.h
@@ -30,7 +30,7 @@ extern unsigned int saa7146_debug;
 	#define DEBUG_VARIABLE saa7146_debug
 #endif
 
-#define DEBUG_PROLOG printk("%s: %s(): ",KBUILD_MODNAME,__FUNCTION__)
+#define DEBUG_PROLOG printk("%s: %s(): ",KBUILD_MODNAME, __func__)
 #define INFO(x) { printk("%s: ",KBUILD_MODNAME); printk x; }
 
 #define ERR(x) { DEBUG_PROLOG; printk x; }