2011-02-27 13:22:26 +02:00
|
|
|
--- a/drivers/net/wireless/iwlegacy/iwl3945-base.c
|
|
|
|
+++ b/drivers/net/wireless/iwlegacy/iwl3945-base.c
|
2010-12-04 03:32:04 +02:00
|
|
|
@@ -27,6 +27,7 @@
|
|
|
|
*
|
|
|
|
*****************************************************************************/
|
|
|
|
|
|
|
|
+#undef pr_fmt
|
|
|
|
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
|
|
|
|
|
|
|
#include <linux/kernel.h>
|
|
|
|
--- a/drivers/net/wireless/libertas_tf/cmd.c
|
|
|
|
+++ b/drivers/net/wireless/libertas_tf/cmd.c
|
|
|
|
@@ -7,6 +7,7 @@
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or (at
|
|
|
|
* your option) any later version.
|
|
|
|
*/
|
|
|
|
+#undef pr_fmt
|
|
|
|
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
|
|
|
|
2011-08-11 16:52:27 +03:00
|
|
|
#include <linux/hardirq.h>
|
2010-12-04 03:32:04 +02:00
|
|
|
--- a/drivers/net/wireless/libertas_tf/if_usb.c
|
|
|
|
+++ b/drivers/net/wireless/libertas_tf/if_usb.c
|
|
|
|
@@ -9,6 +9,7 @@
|
|
|
|
*/
|
|
|
|
#define DRV_NAME "lbtf_usb"
|
|
|
|
|
|
|
|
+#undef pr_fmt
|
|
|
|
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
|
|
|
|
|
|
|
#include "libertas_tf.h"
|
|
|
|
--- a/drivers/net/wireless/libertas_tf/main.c
|
|
|
|
+++ b/drivers/net/wireless/libertas_tf/main.c
|
|
|
|
@@ -7,6 +7,7 @@
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or (at
|
|
|
|
* your option) any later version.
|
|
|
|
*/
|
|
|
|
+#undef pr_fmt
|
|
|
|
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
|
|
|
|
2011-08-11 16:52:27 +03:00
|
|
|
#include <linux/hardirq.h>
|
2010-12-04 03:32:04 +02:00
|
|
|
--- a/net/wireless/core.c
|
|
|
|
+++ b/net/wireless/core.c
|
|
|
|
@@ -4,6 +4,7 @@
|
|
|
|
* Copyright 2006-2010 Johannes Berg <johannes@sipsolutions.net>
|
|
|
|
*/
|
|
|
|
|
|
|
|
+#undef pr_fmt
|
|
|
|
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
|
|
|
|
|
|
|
#include <linux/if.h>
|
|
|
|
--- a/net/wireless/lib80211.c
|
|
|
|
+++ b/net/wireless/lib80211.c
|
|
|
|
@@ -13,6 +13,7 @@
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
+#undef pr_fmt
|
|
|
|
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
|
|
|
|
|
|
|
#include <linux/module.h>
|
|
|
|
--- a/net/wireless/lib80211_crypt_tkip.c
|
|
|
|
+++ b/net/wireless/lib80211_crypt_tkip.c
|
|
|
|
@@ -10,6 +10,7 @@
|
|
|
|
* more details.
|
|
|
|
*/
|
|
|
|
|
|
|
|
+#undef pr_fmt
|
|
|
|
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
|
|
|
|
|
|
|
#include <linux/err.h>
|
|
|
|
--- a/net/wireless/reg.c
|
|
|
|
+++ b/net/wireless/reg.c
|
|
|
|
@@ -33,6 +33,7 @@
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
+#undef pr_fmt
|
|
|
|
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
|
|
|
|
|
|
|
#include <linux/kernel.h>
|
2011-02-27 13:22:26 +02:00
|
|
|
--- a/drivers/net/wireless/iwlegacy/iwl4965-base.c
|
|
|
|
+++ b/drivers/net/wireless/iwlegacy/iwl4965-base.c
|
|
|
|
@@ -27,6 +27,7 @@
|
|
|
|
*
|
|
|
|
*****************************************************************************/
|
|
|
|
|
|
|
|
+#undef pr_fmt
|
|
|
|
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
|
|
|
|
|
|
|
#include <linux/kernel.h>
|
2011-05-17 00:50:26 +03:00
|
|
|
--- a/drivers/net/wireless/libertas/cfg.c
|
|
|
|
+++ b/drivers/net/wireless/libertas/cfg.c
|
|
|
|
@@ -6,6 +6,7 @@
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
+#undef pr_fmt
|
|
|
|
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
|
|
|
|
2011-08-11 16:52:27 +03:00
|
|
|
#include <linux/hardirq.h>
|
2011-05-17 00:50:26 +03:00
|
|
|
--- a/drivers/net/wireless/libertas/if_cs.c
|
|
|
|
+++ b/drivers/net/wireless/libertas/if_cs.c
|
|
|
|
@@ -21,6 +21,7 @@
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
+#undef pr_fmt
|
|
|
|
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
|
|
|
|
|
|
|
#include <linux/module.h>
|
|
|
|
--- a/drivers/net/wireless/libertas/if_sdio.c
|
|
|
|
+++ b/drivers/net/wireless/libertas/if_sdio.c
|
|
|
|
@@ -26,6 +26,7 @@
|
|
|
|
* if_sdio_card_to_host() to pad the data.
|
|
|
|
*/
|
|
|
|
|
|
|
|
+#undef pr_fmt
|
|
|
|
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
|
|
|
|
|
|
|
#include <linux/kernel.h>
|
|
|
|
--- a/drivers/net/wireless/libertas/if_spi.c
|
|
|
|
+++ b/drivers/net/wireless/libertas/if_spi.c
|
|
|
|
@@ -17,6 +17,7 @@
|
|
|
|
* (at your option) any later version.
|
|
|
|
*/
|
|
|
|
|
|
|
|
+#undef pr_fmt
|
|
|
|
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
|
|
|
|
2011-08-11 16:52:27 +03:00
|
|
|
#include <linux/hardirq.h>
|
2011-05-17 00:50:26 +03:00
|
|
|
--- a/drivers/net/wireless/libertas/if_usb.c
|
|
|
|
+++ b/drivers/net/wireless/libertas/if_usb.c
|
|
|
|
@@ -2,6 +2,7 @@
|
|
|
|
* This file contains functions used in USB interface module.
|
|
|
|
*/
|
|
|
|
|
|
|
|
+#undef pr_fmt
|
|
|
|
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
|
|
|
|
|
|
|
#include <linux/delay.h>
|
|
|
|
--- a/drivers/net/wireless/libertas/main.c
|
|
|
|
+++ b/drivers/net/wireless/libertas/main.c
|
|
|
|
@@ -4,6 +4,7 @@
|
|
|
|
* thread etc..
|
|
|
|
*/
|
|
|
|
|
|
|
|
+#undef pr_fmt
|
|
|
|
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
|
|
|
|
|
|
|
#include <linux/moduleparam.h>
|
|
|
|
--- a/drivers/net/wireless/libertas/mesh.c
|
|
|
|
+++ b/drivers/net/wireless/libertas/mesh.c
|
|
|
|
@@ -1,3 +1,4 @@
|
|
|
|
+#undef pr_fmt
|
|
|
|
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
|
|
|
|
|
|
|
#include <linux/delay.h>
|
|
|
|
--- a/drivers/net/wireless/libertas/rx.c
|
|
|
|
+++ b/drivers/net/wireless/libertas/rx.c
|
|
|
|
@@ -2,6 +2,7 @@
|
|
|
|
* This file contains the handling of RX in wlan driver.
|
|
|
|
*/
|
|
|
|
|
|
|
|
+#undef pr_fmt
|
|
|
|
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
|
|
|
|
|
|
|
#include <linux/etherdevice.h>
|