aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/meth.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-09-24 16:09:13 -0700
committerDavid S. Miller <davem@davemloft.net>2008-09-24 16:09:13 -0700
commit152cbcf94baec68b45832db5024184906ab798b1 (patch)
treee469a602535fec4355e5b63671eaf52cdd94caaf /drivers/net/meth.c
parent96ca4a2cc1454cf633a1e0796b7ef39d937b87ec (diff)
parentfa53ebac42d3de04619c813f5f6628ca2a7ce97f (diff)
downloadkernel_samsung_tuna-152cbcf94baec68b45832db5024184906ab798b1.zip
kernel_samsung_tuna-152cbcf94baec68b45832db5024184906ab798b1.tar.gz
kernel_samsung_tuna-152cbcf94baec68b45832db5024184906ab798b1.tar.bz2
Merge branch 'davem-next' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/meth.c')
-rw-r--r--drivers/net/meth.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/meth.c b/drivers/net/meth.c
index 0a97c26..a1e22ed 100644
--- a/drivers/net/meth.c
+++ b/drivers/net/meth.c
@@ -41,7 +41,7 @@
#endif
#if MFE_DEBUG>=1
-#define DPRINTK(str,args...) printk(KERN_DEBUG "meth: %s: " str, __FUNCTION__ , ## args)
+#define DPRINTK(str,args...) printk(KERN_DEBUG "meth: %s: " str, __func__ , ## args)
#define MFE_RX_DEBUG 2
#else
#define DPRINTK(str,args...)