summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--patches/collateral-evolutions/network/53-pr_fmt.patch105
1 files changed, 0 insertions, 105 deletions
diff --git a/patches/collateral-evolutions/network/53-pr_fmt.patch b/patches/collateral-evolutions/network/53-pr_fmt.patch
index 9dc8d644..80f253ce 100644
--- a/patches/collateral-evolutions/network/53-pr_fmt.patch
+++ b/patches/collateral-evolutions/network/53-pr_fmt.patch
@@ -255,111 +255,6 @@ compiler warnings. This is going to be sent upstream.
#include <linux/netdevice.h>
#include <linux/module.h>
---- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
-+++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
-@@ -14,8 +14,10 @@
- * 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/types.h>
- #include <linux/netdevice.h>
- #include <linux/mmc/sdio.h>
---- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c
-+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c
-@@ -19,8 +19,10 @@
- * For certain dcmd codes, the dongle interprets string data from the host.
- ******************************************************************************/
-
-+#undef pr_fmt
- #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-+#include <linux/printk.h>
- #include <linux/types.h>
- #include <linux/netdevice.h>
-
---- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
-+++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
-@@ -15,8 +15,10 @@
- */
- /* ****************** SDIO CARD Interface Functions **************************/
-
-+#undef pr_fmt
- #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-+#include <linux/printk.h>
- #include <linux/types.h>
- #include <linux/netdevice.h>
- #include <linux/export.h>
---- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
-+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
-@@ -14,10 +14,12 @@
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-+#undef pr_fmt
- #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
- #include <linux/kernel.h>
- #include <linux/etherdevice.h>
-+#include <linux/printk.h>
- #include <linux/module.h>
- #include <net/cfg80211.h>
- #include <net/rtnetlink.h>
---- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
-+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
-@@ -14,9 +14,11 @@
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-+#undef pr_fmt
- #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
- #include <linux/kernel.h>
-+#include <linux/printk.h>
- #include <linux/string.h>
- #include <linux/netdevice.h>
- #include <brcmu_wifi.h>
---- a/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
-+++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
-@@ -15,8 +15,10 @@
- */
- /* ***** SDIO interface chip backplane handle functions ***** */
-
-+#undef pr_fmt
- #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-+#include <linux/printk.h>
- #include <linux/types.h>
- #include <linux/netdevice.h>
- #include <linux/mmc/card.h>
---- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
-+++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
-@@ -16,9 +16,11 @@
-
- /* Toplevel file. Relies on dhd_linux.c to send commands to the dongle. */
-
-+#undef pr_fmt
- #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
- #include <linux/kernel.h>
-+#include <linux/printk.h>
- #include <linux/etherdevice.h>
- #include <net/cfg80211.h>
- #include <net/netlink.h>
---- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
-+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
-@@ -14,6 +14,7 @@
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-+#undef pr_fmt
- #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
- #include <linux/types.h>
--- a/net/bluetooth/lib.c
+++ b/net/bluetooth/lib.c
@@ -24,9 +24,11 @@