Fix a macro redefined warning: net/wireless/reg.c:45:1 warning: "pr_fmt" redefined Also remove an unused instance in core.c Signed-off-by: Vivek Natarajan <nataraja@xxxxxxxxxxxxxxxx> --- net/wireless/core.c | 2 -- net/wireless/reg.c | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net/wireless/core.c b/net/wireless/core.c index ccdfed8..067c008 100644 --- a/net/wireless/core.c +++ b/net/wireless/core.c @@ -4,8 +4,6 @@ * Copyright 2006-2010 Johannes Berg <johannes@xxxxxxxxxxxxxxxx> */ -#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - #include <linux/if.h> #include <linux/module.h> #include <linux/err.h> diff --git a/net/wireless/reg.c b/net/wireless/reg.c index e9a0ac8..1797fcc 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -42,7 +42,9 @@ * */ +#ifndef pr_fmt #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt +#endif #include <linux/kernel.h> #include <linux/export.h> -- 1.7.0.4 -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
