diff options
| author | David S. Miller <davem@davemloft.net> | 2008-09-24 19:09:13 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-24 19:09:13 -0400 |
| commit | 152cbcf94baec68b45832db5024184906ab798b1 (patch) | |
| tree | e469a602535fec4355e5b63671eaf52cdd94caaf /drivers/net/meth.c | |
| parent | 96ca4a2cc1454cf633a1e0796b7ef39d937b87ec (diff) | |
| parent | fa53ebac42d3de04619c813f5f6628ca2a7ce97f (diff) | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/meth.c b/drivers/net/meth.c index 0a97c26df6ab..a1e22ed1f6ee 100644 --- a/drivers/net/meth.c +++ b/drivers/net/meth.c | |||
| @@ -41,7 +41,7 @@ | |||
| 41 | #endif | 41 | #endif |
| 42 | 42 | ||
| 43 | #if MFE_DEBUG>=1 | 43 | #if MFE_DEBUG>=1 |
| 44 | #define DPRINTK(str,args...) printk(KERN_DEBUG "meth: %s: " str, __FUNCTION__ , ## args) | 44 | #define DPRINTK(str,args...) printk(KERN_DEBUG "meth: %s: " str, __func__ , ## args) |
| 45 | #define MFE_RX_DEBUG 2 | 45 | #define MFE_RX_DEBUG 2 |
| 46 | #else | 46 | #else |
| 47 | #define DPRINTK(str,args...) | 47 | #define DPRINTK(str,args...) |