| 1 | --- a/drivers/net/wireless/iwlwifi/iwl-agn.c |
| 2 | +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c |
| 3 | @@ -27,6 +27,7 @@ |
| 4 | * |
| 5 | *****************************************************************************/ |
| 6 | |
| 7 | +#undef pr_fmt |
| 8 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt |
| 9 | |
| 10 | #include <linux/kernel.h> |
| 11 | --- a/drivers/net/wireless/iwlegacy/iwl3945-base.c |
| 12 | +++ b/drivers/net/wireless/iwlegacy/iwl3945-base.c |
| 13 | @@ -27,6 +27,7 @@ |
| 14 | * |
| 15 | *****************************************************************************/ |
| 16 | |
| 17 | +#undef pr_fmt |
| 18 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt |
| 19 | |
| 20 | #include <linux/kernel.h> |
| 21 | --- a/drivers/net/wireless/libertas_tf/cmd.c |
| 22 | +++ b/drivers/net/wireless/libertas_tf/cmd.c |
| 23 | @@ -7,6 +7,7 @@ |
| 24 | * the Free Software Foundation; either version 2 of the License, or (at |
| 25 | * your option) any later version. |
| 26 | */ |
| 27 | +#undef pr_fmt |
| 28 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt |
| 29 | |
| 30 | #include <linux/slab.h> |
| 31 | --- a/drivers/net/wireless/libertas_tf/if_usb.c |
| 32 | +++ b/drivers/net/wireless/libertas_tf/if_usb.c |
| 33 | @@ -9,6 +9,7 @@ |
| 34 | */ |
| 35 | #define DRV_NAME "lbtf_usb" |
| 36 | |
| 37 | +#undef pr_fmt |
| 38 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt |
| 39 | |
| 40 | #include "libertas_tf.h" |
| 41 | --- a/drivers/net/wireless/libertas_tf/main.c |
| 42 | +++ b/drivers/net/wireless/libertas_tf/main.c |
| 43 | @@ -7,6 +7,7 @@ |
| 44 | * the Free Software Foundation; either version 2 of the License, or (at |
| 45 | * your option) any later version. |
| 46 | */ |
| 47 | +#undef pr_fmt |
| 48 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt |
| 49 | |
| 50 | #include <linux/slab.h> |
| 51 | --- a/net/wireless/core.c |
| 52 | +++ b/net/wireless/core.c |
| 53 | @@ -4,6 +4,7 @@ |
| 54 | * Copyright 2006-2010 Johannes Berg <johannes@sipsolutions.net> |
| 55 | */ |
| 56 | |
| 57 | +#undef pr_fmt |
| 58 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt |
| 59 | |
| 60 | #include <linux/if.h> |
| 61 | --- a/net/wireless/lib80211.c |
| 62 | +++ b/net/wireless/lib80211.c |
| 63 | @@ -13,6 +13,7 @@ |
| 64 | * |
| 65 | */ |
| 66 | |
| 67 | +#undef pr_fmt |
| 68 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt |
| 69 | |
| 70 | #include <linux/module.h> |
| 71 | --- a/net/wireless/lib80211_crypt_tkip.c |
| 72 | +++ b/net/wireless/lib80211_crypt_tkip.c |
| 73 | @@ -10,6 +10,7 @@ |
| 74 | * more details. |
| 75 | */ |
| 76 | |
| 77 | +#undef pr_fmt |
| 78 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt |
| 79 | |
| 80 | #include <linux/err.h> |
| 81 | --- a/net/wireless/reg.c |
| 82 | +++ b/net/wireless/reg.c |
| 83 | @@ -33,6 +33,7 @@ |
| 84 | * |
| 85 | */ |
| 86 | |
| 87 | +#undef pr_fmt |
| 88 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt |
| 89 | |
| 90 | #include <linux/kernel.h> |
| 91 | --- a/drivers/net/wireless/iwlegacy/iwl4965-base.c |
| 92 | +++ b/drivers/net/wireless/iwlegacy/iwl4965-base.c |
| 93 | @@ -27,6 +27,7 @@ |
| 94 | * |
| 95 | *****************************************************************************/ |
| 96 | |
| 97 | +#undef pr_fmt |
| 98 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt |
| 99 | |
| 100 | #include <linux/kernel.h> |
| 101 | --- a/drivers/net/wireless/libertas/cfg.c |
| 102 | +++ b/drivers/net/wireless/libertas/cfg.c |
| 103 | @@ -6,6 +6,7 @@ |
| 104 | * |
| 105 | */ |
| 106 | |
| 107 | +#undef pr_fmt |
| 108 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt |
| 109 | |
| 110 | #include <linux/sched.h> |
| 111 | --- a/drivers/net/wireless/libertas/if_cs.c |
| 112 | +++ b/drivers/net/wireless/libertas/if_cs.c |
| 113 | @@ -21,6 +21,7 @@ |
| 114 | |
| 115 | */ |
| 116 | |
| 117 | +#undef pr_fmt |
| 118 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt |
| 119 | |
| 120 | #include <linux/module.h> |
| 121 | --- a/drivers/net/wireless/libertas/if_sdio.c |
| 122 | +++ b/drivers/net/wireless/libertas/if_sdio.c |
| 123 | @@ -26,6 +26,7 @@ |
| 124 | * if_sdio_card_to_host() to pad the data. |
| 125 | */ |
| 126 | |
| 127 | +#undef pr_fmt |
| 128 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt |
| 129 | |
| 130 | #include <linux/kernel.h> |
| 131 | --- a/drivers/net/wireless/libertas/if_spi.c |
| 132 | +++ b/drivers/net/wireless/libertas/if_spi.c |
| 133 | @@ -17,6 +17,7 @@ |
| 134 | * (at your option) any later version. |
| 135 | */ |
| 136 | |
| 137 | +#undef pr_fmt |
| 138 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt |
| 139 | |
| 140 | #include <linux/moduleparam.h> |
| 141 | --- a/drivers/net/wireless/libertas/if_usb.c |
| 142 | +++ b/drivers/net/wireless/libertas/if_usb.c |
| 143 | @@ -2,6 +2,7 @@ |
| 144 | * This file contains functions used in USB interface module. |
| 145 | */ |
| 146 | |
| 147 | +#undef pr_fmt |
| 148 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt |
| 149 | |
| 150 | #include <linux/delay.h> |
| 151 | --- a/drivers/net/wireless/libertas/main.c |
| 152 | +++ b/drivers/net/wireless/libertas/main.c |
| 153 | @@ -4,6 +4,7 @@ |
| 154 | * thread etc.. |
| 155 | */ |
| 156 | |
| 157 | +#undef pr_fmt |
| 158 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt |
| 159 | |
| 160 | #include <linux/moduleparam.h> |
| 161 | --- a/drivers/net/wireless/libertas/mesh.c |
| 162 | +++ b/drivers/net/wireless/libertas/mesh.c |
| 163 | @@ -1,3 +1,4 @@ |
| 164 | +#undef pr_fmt |
| 165 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt |
| 166 | |
| 167 | #include <linux/delay.h> |
| 168 | --- a/drivers/net/wireless/libertas/rx.c |
| 169 | +++ b/drivers/net/wireless/libertas/rx.c |
| 170 | @@ -2,6 +2,7 @@ |
| 171 | * This file contains the handling of RX in wlan driver. |
| 172 | */ |
| 173 | |
| 174 | +#undef pr_fmt |
| 175 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt |
| 176 | |
| 177 | #include <linux/etherdevice.h> |
| 178 | |