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/ixgb/ixgb.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/ixgb/ixgb.h')
| -rw-r--r-- | drivers/net/ixgb/ixgb.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ixgb/ixgb.h b/drivers/net/ixgb/ixgb.h index 804698fc6a8f..d85717e3022a 100644 --- a/drivers/net/ixgb/ixgb.h +++ b/drivers/net/ixgb/ixgb.h | |||
| @@ -85,7 +85,7 @@ struct ixgb_adapter; | |||
| 85 | #define DPRINTK(nlevel, klevel, fmt, args...) \ | 85 | #define DPRINTK(nlevel, klevel, fmt, args...) \ |
| 86 | (void)((NETIF_MSG_##nlevel & adapter->msg_enable) && \ | 86 | (void)((NETIF_MSG_##nlevel & adapter->msg_enable) && \ |
| 87 | printk(KERN_##klevel PFX "%s: %s: " fmt, adapter->netdev->name, \ | 87 | printk(KERN_##klevel PFX "%s: %s: " fmt, adapter->netdev->name, \ |
| 88 | __FUNCTION__ , ## args)) | 88 | __func__ , ## args)) |
| 89 | 89 | ||
| 90 | 90 | ||
| 91 | /* TX/RX descriptor defines */ | 91 | /* TX/RX descriptor defines */ |