diff options
author | Chris Zankel <chris@zankel.net> | 2009-04-03 05:29:05 -0400 |
---|---|---|
committer | Chris Zankel <chris@zankel.net> | 2009-04-03 05:29:05 -0400 |
commit | 65127d28e312bb6b38ce84a7bb71d762ef63ad4c (patch) | |
tree | d5fdf52a2d0731f7fab0ce0ed394faac50b04fbc /drivers/net/ixgbe/ixgbe_common.h | |
parent | b8bb76713ec50df2f11efee386e16f93d51e1076 (diff) | |
parent | 8fe74cf053de7ad2124a894996f84fa890a81093 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into merge
Diffstat (limited to 'drivers/net/ixgbe/ixgbe_common.h')
-rw-r--r-- | drivers/net/ixgbe/ixgbe_common.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/net/ixgbe/ixgbe_common.h b/drivers/net/ixgbe/ixgbe_common.h index 7e94d6d399ab..24f73e719c3f 100644 --- a/drivers/net/ixgbe/ixgbe_common.h +++ b/drivers/net/ixgbe/ixgbe_common.h | |||
@@ -96,14 +96,11 @@ s32 ixgbe_write_analog_reg8_generic(struct ixgbe_hw *hw, u32 reg, u8 val); | |||
96 | #define IXGBE_WRITE_FLUSH(a) IXGBE_READ_REG(a, IXGBE_STATUS) | 96 | #define IXGBE_WRITE_FLUSH(a) IXGBE_READ_REG(a, IXGBE_STATUS) |
97 | 97 | ||
98 | #ifdef DEBUG | 98 | #ifdef DEBUG |
99 | extern char *ixgbe_get_hw_dev_name(struct ixgbe_hw *hw); | ||
99 | #define hw_dbg(hw, format, arg...) \ | 100 | #define hw_dbg(hw, format, arg...) \ |
100 | printk(KERN_DEBUG, "%s: " format, ixgbe_get_hw_dev_name(hw), ##arg); | 101 | printk(KERN_DEBUG "%s: " format, ixgbe_get_hw_dev_name(hw), ##arg) |
101 | #else | 102 | #else |
102 | static inline int __attribute__ ((format (printf, 2, 3))) | 103 | #define hw_dbg(hw, format, arg...) do {} while (0) |
103 | hw_dbg(struct ixgbe_hw *hw, const char *format, ...) | ||
104 | { | ||
105 | return 0; | ||
106 | } | ||
107 | #endif | 104 | #endif |
108 | 105 | ||
109 | #endif /* IXGBE_COMMON */ | 106 | #endif /* IXGBE_COMMON */ |