2012-02-15 02:44:25

by Larry Finger

[permalink] [raw]
Subject: [PATCH] rtlwifi: Fix warning in debug.c

Since commit e82912dc, compilation of rtlwifi has resulted in the following
warning:

In file included from drivers/net/wireless/rtlwifi/debug.c:31:0:
drivers/net/wireless/rtlwifi/wifi.h:33:0: warning: "pr_fmt" redefined [enabled by default]
include/linux/printk.h:152:0: note: this is the location of the previous definition

The fix is to ensure that wifi.h s included before any header files that pull in
printk.h.

Signed-off-by: Larry Finger <[email protected]>
---

John,

This problem only occurs in wireless-testing, and not in mainline. Commit d273bb20
starts the problem.

Larry
---

drivers/net/wireless/rtlwifi/debug.c | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/rtlwifi/debug.c b/drivers/net/wireless/rtlwifi/debug.c
index 1d9b456..bdda9b2 100644
--- a/drivers/net/wireless/rtlwifi/debug.c
+++ b/drivers/net/wireless/rtlwifi/debug.c
@@ -26,8 +26,6 @@
* Larry Finger <[email protected]>
*****************************************************************************/

-#include <linux/moduleparam.h>
-
#include "wifi.h"

#include <linux/moduleparam.h>
--
1.7.7