diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-14 20:31:54 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-14 20:31:54 -0400 |
| commit | 6dc6472581f693b5fc95aebedf67b4960fb85cf0 (patch) | |
| tree | 06a5a9a08519950575505273eabced331ed51405 /drivers/net/ixgb/ixgb.h | |
| parent | ee673eaa72d8d185012b1027a05e25aba18c267f (diff) | |
| parent | 8acd3a60bcca17c6d89c73cee3ad6057eb83ba1e (diff) | |
Merge commit 'origin'
Manual fixup of conflicts on:
arch/powerpc/include/asm/dcr-regs.h
drivers/net/ibm_newemac/core.h
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 */ |