summaryrefslogtreecommitdiff
path: root/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2011-11-04 07:32:20 +0400
committerGrant Likely <grant.likely@secretlab.ca>2011-11-04 07:32:20 +0400
commit3983138c017b6aeab6ce3dbb1e9afbe80bdac496 (patch)
tree9fdcddfdb8ada91504c90e2551ba6a565ade7325 /drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
parented5f886d16369fed5a69d96b8e85777c47206de1 (diff)
parent02aac316abf436a7529d46a71f7083f9f9ef4b49 (diff)
downloadlinux-3983138c017b6aeab6ce3dbb1e9afbe80bdac496.tar.xz
Merge branch 'for-grant' of git://sources.calxeda.com/kernel/linux into devicetree/merge
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx4/mlx4_en.h')
-rw-r--r--drivers/net/ethernet/mellanox/mlx4/mlx4_en.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
index fca66165110e..8fda331c65df 100644
--- a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
+++ b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
@@ -581,8 +581,9 @@ extern const struct ethtool_ops mlx4_en_ethtool_ops;
* printk / logging functions
*/
+__printf(3, 4)
int en_print(const char *level, const struct mlx4_en_priv *priv,
- const char *format, ...) __attribute__ ((format (printf, 3, 4)));
+ const char *format, ...);
#define en_dbg(mlevel, priv, format, arg...) \
do { \