diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-11 15:39:35 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-11 15:39:35 -0400 |
| commit | 56c5d900dbb8e042bfad035d18433476931d8f93 (patch) | |
| tree | 00b793965beeef10db03e0ff021d2d965c410759 /drivers/net/ixgb/ixgb.h | |
| parent | 4dd95b63ae25c5cad6986829b5e8788e9faa0330 (diff) | |
| parent | ead9d23d803ea3a73766c3cb27bf7563ac8d7266 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
sound/core/memalloc.c
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 */ |