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/bonding/bonding.h | |
| 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/bonding/bonding.h')
| -rw-r--r-- | drivers/net/bonding/bonding.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h index fb730ec0396f..f7b40edabfd8 100644 --- a/drivers/net/bonding/bonding.h +++ b/drivers/net/bonding/bonding.h | |||
| @@ -32,7 +32,7 @@ | |||
| 32 | #ifdef BONDING_DEBUG | 32 | #ifdef BONDING_DEBUG |
| 33 | #define dprintk(fmt, args...) \ | 33 | #define dprintk(fmt, args...) \ |
| 34 | printk(KERN_DEBUG \ | 34 | printk(KERN_DEBUG \ |
| 35 | DRV_NAME ": %s() %d: " fmt, __FUNCTION__, __LINE__ , ## args ) | 35 | DRV_NAME ": %s() %d: " fmt, __func__, __LINE__ , ## args ) |
| 36 | #else | 36 | #else |
| 37 | #define dprintk(fmt, args...) | 37 | #define dprintk(fmt, args...) |
| 38 | #endif /* BONDING_DEBUG */ | 38 | #endif /* BONDING_DEBUG */ |