diff options
author | David S. Miller <davem@davemloft.net> | 2011-01-16 05:48:28 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-01-16 05:48:28 +0100 |
commit | d78c68efa84ff312f3663dbf921b1e3485232205 (patch) | |
tree | e2c6e640d747bdd815ce3795f6c37f8f4ca1161d /net/batman-adv/main.h | |
parent | qeth: l3 hw tx csum circumvent hw bug (diff) | |
parent | batman-adv: Use "__attribute__" shortcut macros (diff) | |
download | linux-d78c68efa84ff312f3663dbf921b1e3485232205.tar.xz linux-d78c68efa84ff312f3663dbf921b1e3485232205.zip |
Merge branch 'for-david' of git://git.open-mesh.org/ecsv/linux-merge
Diffstat (limited to 'net/batman-adv/main.h')
-rw-r--r-- | net/batman-adv/main.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index d4d9926c2201..65106fb61b8f 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -151,9 +151,9 @@ int debug_log(struct bat_priv *bat_priv, char *fmt, ...); } \ while (0) #else /* !CONFIG_BATMAN_ADV_DEBUG */ -static inline void bat_dbg(char type __attribute__((unused)), - struct bat_priv *bat_priv __attribute__((unused)), - char *fmt __attribute__((unused)), ...) +static inline void bat_dbg(char type __always_unused, + struct bat_priv *bat_priv __always_unused, + char *fmt __always_unused, ...) { } #endif |