From: "Luis R. Rodriguez" <mcgrof@xxxxxxxxxxxxx> pr_fmt() is either defined or we redefine it. Typically drivers define it prior to including printk.h but this is done under the assumption that no other subsystem it uses has already defined pr_fmt(). In such cases pr_fmt() should be undefined and redefined. Doing this properly shaves down compilation time quite considerably. Cc: Kalle Valo <kvalo@xxxxxxxxxxxxxxxx> Signed-off-by: Luis R. Rodriguez <mcgrof@xxxxxxxxxxxxx> --- drivers/net/wireless/ath/ath6kl/cfg80211.c | 2 ++ drivers/net/wireless/ath/ath6kl/init.c | 2 ++ drivers/net/wireless/ath/ath6kl/main.c | 3 +++ drivers/net/wireless/ath/ath6kl/txrx.c | 3 +++ 4 files changed, 10 insertions(+) diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c index 28a65d3..db9b7cf 100644 --- a/drivers/net/wireless/ath/ath6kl/cfg80211.c +++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c @@ -15,8 +15,10 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#undef pr_fmt #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt +#include <linux/printk.h> #include <linux/moduleparam.h> #include <linux/inetdevice.h> #include <linux/export.h> diff --git a/drivers/net/wireless/ath/ath6kl/init.c b/drivers/net/wireless/ath/ath6kl/init.c index 29ef50e..68af79d 100644 --- a/drivers/net/wireless/ath/ath6kl/init.c +++ b/drivers/net/wireless/ath/ath6kl/init.c @@ -16,8 +16,10 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#undef pr_fmt #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt +#include <linux/printk.h> #include <linux/moduleparam.h> #include <linux/errno.h> #include <linux/export.h> diff --git a/drivers/net/wireless/ath/ath6kl/main.c b/drivers/net/wireless/ath/ath6kl/main.c index 4d818f9..c173a78 100644 --- a/drivers/net/wireless/ath/ath6kl/main.c +++ b/drivers/net/wireless/ath/ath6kl/main.c @@ -15,8 +15,11 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#undef pr_fmt #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt +#include <linux/printk.h> + #include "core.h" #include "hif-ops.h" #include "cfg80211.h" diff --git a/drivers/net/wireless/ath/ath6kl/txrx.c b/drivers/net/wireless/ath/ath6kl/txrx.c index 82f2f5c..920265e 100644 --- a/drivers/net/wireless/ath/ath6kl/txrx.c +++ b/drivers/net/wireless/ath/ath6kl/txrx.c @@ -15,8 +15,11 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#undef pr_fmt #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt +#include <linux/printk.h> + #include "core.h" #include "debug.h" #include "htc-ops.h" -- 1.7.10.rc1.22.gf5241 -- 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
