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/pci-skeleton.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/pci-skeleton.c')
-rw-r--r-- | drivers/net/pci-skeleton.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/pci-skeleton.c b/drivers/net/pci-skeleton.c index 53451c3b2c0d..0a575fef29e6 100644 --- a/drivers/net/pci-skeleton.c +++ b/drivers/net/pci-skeleton.c | |||
@@ -119,7 +119,7 @@ KERN_INFO " Support available from http://foo.com/bar/baz.html\n"; | |||
119 | 119 | ||
120 | #ifdef NETDRV_DEBUG | 120 | #ifdef NETDRV_DEBUG |
121 | /* note: prints function name for you */ | 121 | /* note: prints function name for you */ |
122 | # define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt, __FUNCTION__ , ## args) | 122 | # define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt, __func__ , ## args) |
123 | #else | 123 | #else |
124 | # define DPRINTK(fmt, args...) | 124 | # define DPRINTK(fmt, args...) |
125 | #endif | 125 | #endif |
@@ -130,7 +130,7 @@ KERN_INFO " Support available from http://foo.com/bar/baz.html\n"; | |||
130 | # define assert(expr) \ | 130 | # define assert(expr) \ |
131 | if(!(expr)) { \ | 131 | if(!(expr)) { \ |
132 | printk( "Assertion failed! %s,%s,%s,line=%d\n", \ | 132 | printk( "Assertion failed! %s,%s,%s,line=%d\n", \ |
133 | #expr,__FILE__,__FUNCTION__,__LINE__); \ | 133 | #expr,__FILE__,__func__,__LINE__); \ |
134 | } | 134 | } |
135 | #endif | 135 | #endif |
136 | 136 | ||