From: Johannes Berg Date: Thu, 11 Apr 2013 23:12:15 +0000 (+0200) Subject: backports: dissolve backport.h X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e07361fd59804d10b759f4be1a7d2ddf703881b4;p=openwrt%2Fstaging%2Fblogic.git backports: dissolve backport.h We'll resolve all the other compat-*.h files next. To keep it compiling, we now also need to remove all the pr_fmt patches (they add printk.h which can't be included as the first header file any more.) I attempted to simply not include anything from the command line, but very old kernels (e.g. 2.6.24) don't include kconfig.h from the command line but include/linux/autoconf.h directly, and thus won't get our override. Thus we need to keep a very small backport.h. Signed-off-by: Johannes Berg --- diff --git a/backport/backport-include/backport/backport.h b/backport/backport-include/backport/backport.h index c5c194e62424..790fe48d26b1 100644 --- a/backport/backport-include/backport/backport.h +++ b/backport/backport-include/backport/backport.h @@ -1,82 +1,10 @@ -#ifndef LINUX_BACKPORT_H -#define LINUX_BACKPORT_H +#ifndef __BACKPORT_H +#define __BACKPORT_H +#include #ifndef __ASSEMBLY__ - #define LINUX_BACKPORT(__sym) backport_ ##__sym #include - -#include -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0)) -#include -#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) -#include -#else -#include #endif -#include -#include -#include -#include - -/* - * The define overwriting module_init is based on the original module_init - * which looks like this: - * #define module_init(initfn) \ - * static inline initcall_t __inittest(void) \ - * { return initfn; } \ - * int init_module(void) __attribute__((alias(#initfn))); - * - * To the call to the initfn we added the symbol dependency on compat - * to make sure that compat.ko gets loaded for any compat modules. - */ -void backport_dependency_symbol(void); - -#ifdef BACKPORTS_GIT_TRACKED -#define BACKPORT_MOD_VERSIONS MODULE_VERSION(BACKPORTS_GIT_TRACKED); -#else -#define BACKPORT_MOD_VERSIONS \ - MODULE_VERSION("backported from " BACKPORTED_KERNEL_NAME \ - " (" BACKPORTED_KERNEL_VERSION ")" \ - " using backports " BACKPORTS_VERSION); -#endif - -#undef module_init -#define module_init(initfn) \ - static int __init __init_backport(void) \ - { \ - backport_dependency_symbol(); \ - return initfn(); \ - } \ - int init_module(void) __attribute__((alias("__init_backport")));\ - BACKPORT_MOD_VERSIONS - -/* - * Each compat file represents compatibility code for new kernel - * code introduced for *that* kernel revision. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#endif /* __ASSEMBLY__ */ -#endif /* LINUX_BACKPORT_H */ +#endif /* __BACKPORT_H */ diff --git a/backport/backport-include/linux/module.h b/backport/backport-include/linux/module.h new file mode 100644 index 000000000000..8112ebc197bf --- /dev/null +++ b/backport/backport-include/linux/module.h @@ -0,0 +1,37 @@ +#ifndef __BACKPORT_LINUX_MODULE_H +#define __BACKPORT_LINUX_MODULE_H +#include_next + +/* + * The define overwriting module_init is based on the original module_init + * which looks like this: + * #define module_init(initfn) \ + * static inline initcall_t __inittest(void) \ + * { return initfn; } \ + * int init_module(void) __attribute__((alias(#initfn))); + * + * To the call to the initfn we added the symbol dependency on compat + * to make sure that compat.ko gets loaded for any compat modules. + */ +extern void backport_dependency_symbol(void); + +#ifdef BACKPORTS_GIT_TRACKED +#define BACKPORT_MOD_VERSIONS MODULE_VERSION(BACKPORTS_GIT_TRACKED); +#else +#define BACKPORT_MOD_VERSIONS \ + MODULE_VERSION("backported from " BACKPORTED_KERNEL_NAME \ + " (" BACKPORTED_KERNEL_VERSION ")" \ + " using backports " BACKPORTS_VERSION); +#endif + +#undef module_init +#define module_init(initfn) \ + static int __init __init_backport(void) \ + { \ + backport_dependency_symbol(); \ + return initfn(); \ + } \ + int init_module(void) __attribute__((alias("__init_backport")));\ + BACKPORT_MOD_VERSIONS + +#endif /* __BACKPORT_LINUX_MODULE_H */ diff --git a/backport/compat/compat-2.6.36.c b/backport/compat/compat-2.6.36.c index 92ef827a0e7c..522205a1c5ba 100644 --- a/backport/compat/compat-2.6.36.c +++ b/backport/compat/compat-2.6.36.c @@ -10,6 +10,7 @@ #include #include +#include #ifdef CPTCFG_BACKPORT_OPTION_USB_URB_THREAD_FIX /* Callers must hold anchor->lock */ diff --git a/backport/compat/main.c b/backport/compat/main.c index 9607209d76fb..4cc93c3f6b1f 100644 --- a/backport/compat/main.c +++ b/backport/compat/main.c @@ -1,6 +1,7 @@ #include #include #include "compat-2.6.34.h" +#include MODULE_AUTHOR("Luis R. Rodriguez"); MODULE_DESCRIPTION("Kernel backport module"); diff --git a/patches/collateral-evolutions/drm/98-pr_fmt/INFO b/patches/collateral-evolutions/drm/98-pr_fmt/INFO deleted file mode 100644 index d7895f41e4e4..000000000000 --- a/patches/collateral-evolutions/drm/98-pr_fmt/INFO +++ /dev/null @@ -1,6 +0,0 @@ - -Undef/define/include printk.h for fixing redefinition warnings -during build. - -Patch adapted from compat-wireless tree. - diff --git a/patches/collateral-evolutions/drm/98-pr_fmt/drivers_gpu_drm_drm_fb_helper.patch b/patches/collateral-evolutions/drm/98-pr_fmt/drivers_gpu_drm_drm_fb_helper.patch deleted file mode 100644 index 49af9e73a7b4..000000000000 --- a/patches/collateral-evolutions/drm/98-pr_fmt/drivers_gpu_drm_drm_fb_helper.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/drivers/gpu/drm/drm_fb_helper.c -+++ b/drivers/gpu/drm/drm_fb_helper.c -@@ -27,9 +27,11 @@ - * Dave Airlie - * Jesse Barnes - */ -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include -+#include - #include - #include - #include diff --git a/patches/collateral-evolutions/drm/98-pr_fmt/drivers_gpu_drm_i915_i915_dma.patch b/patches/collateral-evolutions/drm/98-pr_fmt/drivers_gpu_drm_i915_i915_dma.patch deleted file mode 100644 index df64c81052c0..000000000000 --- a/patches/collateral-evolutions/drm/98-pr_fmt/drivers_gpu_drm_i915_i915_dma.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/drivers/gpu/drm/i915/i915_dma.c -+++ b/drivers/gpu/drm/i915/i915_dma.c -@@ -26,6 +26,7 @@ - * - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include -@@ -35,6 +36,7 @@ - #include - #include "i915_drv.h" - #include "i915_trace.h" -+#include - #include - #include - #include diff --git a/patches/collateral-evolutions/drm/98-pr_fmt/drivers_gpu_drm_i915_i915_irq.patch b/patches/collateral-evolutions/drm/98-pr_fmt/drivers_gpu_drm_i915_i915_irq.patch deleted file mode 100644 index 923a8b493937..000000000000 --- a/patches/collateral-evolutions/drm/98-pr_fmt/drivers_gpu_drm_i915_i915_irq.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/drivers/gpu/drm/i915/i915_irq.c -+++ b/drivers/gpu/drm/i915/i915_irq.c -@@ -26,8 +26,10 @@ - * - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -+#include - #include - #include - #include diff --git a/patches/collateral-evolutions/drm/98-pr_fmt/drivers_gpu_drm_i915_intel_opregion.patch b/patches/collateral-evolutions/drm/98-pr_fmt/drivers_gpu_drm_i915_intel_opregion.patch deleted file mode 100644 index 8279c93b2d0d..000000000000 --- a/patches/collateral-evolutions/drm/98-pr_fmt/drivers_gpu_drm_i915_intel_opregion.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/drivers/gpu/drm/i915/intel_opregion.c -+++ b/drivers/gpu/drm/i915/intel_opregion.c -@@ -25,8 +25,10 @@ - * - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -+#include - #include - #include - #include diff --git a/patches/collateral-evolutions/drm/98-pr_fmt/drivers_gpu_drm_i915_intel_panel.patch b/patches/collateral-evolutions/drm/98-pr_fmt/drivers_gpu_drm_i915_intel_panel.patch deleted file mode 100644 index 3a87d9f76126..000000000000 --- a/patches/collateral-evolutions/drm/98-pr_fmt/drivers_gpu_drm_i915_intel_panel.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/drivers/gpu/drm/i915/intel_panel.c -+++ b/drivers/gpu/drm/i915/intel_panel.c -@@ -28,8 +28,10 @@ - * Chris Wilson - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -+#include - #include - #include "intel_drv.h" - diff --git a/patches/collateral-evolutions/drm/98-pr_fmt/drivers_gpu_drm_ttm_ttm_agp_backend.patch b/patches/collateral-evolutions/drm/98-pr_fmt/drivers_gpu_drm_ttm_ttm_agp_backend.patch deleted file mode 100644 index d4a791e49a83..000000000000 --- a/patches/collateral-evolutions/drm/98-pr_fmt/drivers_gpu_drm_ttm_ttm_agp_backend.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/drivers/gpu/drm/ttm/ttm_agp_backend.c -+++ b/drivers/gpu/drm/ttm/ttm_agp_backend.c -@@ -29,8 +29,10 @@ - * Keith Packard. - */ - -+#undef pr_fmt - #define pr_fmt(fmt) "[TTM] " fmt - -+#include - #include - #include - #include diff --git a/patches/collateral-evolutions/drm/98-pr_fmt/drivers_gpu_drm_ttm_ttm_bo.patch b/patches/collateral-evolutions/drm/98-pr_fmt/drivers_gpu_drm_ttm_ttm_bo.patch deleted file mode 100644 index ac5cb1d614b7..000000000000 --- a/patches/collateral-evolutions/drm/98-pr_fmt/drivers_gpu_drm_ttm_ttm_bo.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/drivers/gpu/drm/ttm/ttm_bo.c -+++ b/drivers/gpu/drm/ttm/ttm_bo.c -@@ -28,11 +28,13 @@ - * Authors: Thomas Hellstrom - */ - -+#undef pr_fmt - #define pr_fmt(fmt) "[TTM] " fmt - - #include - #include - #include -+#include - #include - #include - #include diff --git a/patches/collateral-evolutions/drm/98-pr_fmt/drivers_gpu_drm_ttm_ttm_bo_vm.patch b/patches/collateral-evolutions/drm/98-pr_fmt/drivers_gpu_drm_ttm_ttm_bo_vm.patch deleted file mode 100644 index 45c5f053cbdf..000000000000 --- a/patches/collateral-evolutions/drm/98-pr_fmt/drivers_gpu_drm_ttm_ttm_bo_vm.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/drivers/gpu/drm/ttm/ttm_bo_vm.c -+++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c -@@ -28,8 +28,10 @@ - * Authors: Thomas Hellstrom - */ - -+#undef pr_fmt - #define pr_fmt(fmt) "[TTM] " fmt - -+#include - #include - #include - #include diff --git a/patches/collateral-evolutions/drm/98-pr_fmt/drivers_gpu_drm_ttm_ttm_memory.patch b/patches/collateral-evolutions/drm/98-pr_fmt/drivers_gpu_drm_ttm_ttm_memory.patch deleted file mode 100644 index ce492cb53dc5..000000000000 --- a/patches/collateral-evolutions/drm/98-pr_fmt/drivers_gpu_drm_ttm_ttm_memory.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/drivers/gpu/drm/ttm/ttm_memory.c -+++ b/drivers/gpu/drm/ttm/ttm_memory.c -@@ -25,11 +25,13 @@ - * - **************************************************************************/ - -+#undef pr_fmt - #define pr_fmt(fmt) "[TTM] " fmt - - #include - #include - #include -+#include - #include - #include - #include diff --git a/patches/collateral-evolutions/drm/98-pr_fmt/drivers_gpu_drm_ttm_ttm_object.patch b/patches/collateral-evolutions/drm/98-pr_fmt/drivers_gpu_drm_ttm_ttm_object.patch deleted file mode 100644 index 7c8ed9981b45..000000000000 --- a/patches/collateral-evolutions/drm/98-pr_fmt/drivers_gpu_drm_ttm_ttm_object.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/drivers/gpu/drm/ttm/ttm_object.c -+++ b/drivers/gpu/drm/ttm/ttm_object.c -@@ -49,10 +49,12 @@ - * for fast lookup of ref objects given a base object. - */ - -+#undef pr_fmt - #define pr_fmt(fmt) "[TTM] " fmt - - #include - #include -+#include - #include - #include - #include diff --git a/patches/collateral-evolutions/drm/98-pr_fmt/drivers_gpu_drm_ttm_ttm_page_alloc.patch b/patches/collateral-evolutions/drm/98-pr_fmt/drivers_gpu_drm_ttm_ttm_page_alloc.patch deleted file mode 100644 index 355653836664..000000000000 --- a/patches/collateral-evolutions/drm/98-pr_fmt/drivers_gpu_drm_ttm_ttm_page_alloc.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/drivers/gpu/drm/ttm/ttm_page_alloc.c -+++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c -@@ -31,8 +31,10 @@ - * - doesn't track currently in use pages - */ - -+#undef pr_fmt - #define pr_fmt(fmt) "[TTM] " fmt - -+#include - #include - #include - #include diff --git a/patches/collateral-evolutions/drm/98-pr_fmt/drivers_gpu_drm_ttm_ttm_page_alloc_dma.patch b/patches/collateral-evolutions/drm/98-pr_fmt/drivers_gpu_drm_ttm_ttm_page_alloc_dma.patch deleted file mode 100644 index a2c700a15e88..000000000000 --- a/patches/collateral-evolutions/drm/98-pr_fmt/drivers_gpu_drm_ttm_ttm_page_alloc_dma.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c -+++ b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c -@@ -33,8 +33,10 @@ - * when freed). - */ - -+#undef pr_fmt - #define pr_fmt(fmt) "[TTM] " fmt - -+#include - #include - #include - #include /* for seq_printf */ diff --git a/patches/collateral-evolutions/drm/98-pr_fmt/drivers_gpu_drm_ttm_ttm_tt.patch b/patches/collateral-evolutions/drm/98-pr_fmt/drivers_gpu_drm_ttm_ttm_tt.patch deleted file mode 100644 index 2925d7db494b..000000000000 --- a/patches/collateral-evolutions/drm/98-pr_fmt/drivers_gpu_drm_ttm_ttm_tt.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/drivers/gpu/drm/ttm/ttm_tt.c -+++ b/drivers/gpu/drm/ttm/ttm_tt.c -@@ -28,8 +28,10 @@ - * Authors: Thomas Hellstrom - */ - -+#undef pr_fmt - #define pr_fmt(fmt) "[TTM] " fmt - -+#include - #include - #include - #include diff --git a/patches/collateral-evolutions/media/0001-pr_fmt.patch b/patches/collateral-evolutions/media/0001-pr_fmt.patch deleted file mode 100644 index 17aa93aacd7f..000000000000 --- a/patches/collateral-evolutions/media/0001-pr_fmt.patch +++ /dev/null @@ -1,493 +0,0 @@ -We can't really get this udef'd in any easier way. If you figure it out.. -great. - ---- a/drivers/media/media-devnode.c -+++ b/drivers/media/media-devnode.c -@@ -29,11 +29,12 @@ - * character devices using a dynamic major number and proper reference - * counting. - */ -- -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include - #include -+#include - #include - #include - #include ---- a/drivers/media/common/saa7146/saa7146_i2c.c -+++ b/drivers/media/common/saa7146/saa7146_i2c.c -@@ -1,5 +1,7 @@ -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -+#include - #include - - static u32 saa7146_i2c_func(struct i2c_adapter *adapter) ---- a/drivers/media/common/saa7146/saa7146_fops.c -+++ b/drivers/media/common/saa7146/saa7146_fops.c -@@ -1,5 +1,7 @@ -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -+#include - #include - #include - ---- a/drivers/media/common/saa7146/saa7146_core.c -+++ b/drivers/media/common/saa7146/saa7146_core.c -@@ -17,9 +17,10 @@ - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -- -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -+#include - #include - #include - ---- a/drivers/media/common/saa7146/saa7146_video.c -+++ b/drivers/media/common/saa7146/saa7146_video.c -@@ -1,9 +1,11 @@ -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include - #include - #include - #include -+#include - #include - - static int max_memory = 32; ---- a/drivers/media/common/saa7146/saa7146_hlp.c -+++ b/drivers/media/common/saa7146/saa7146_hlp.c -@@ -1,5 +1,7 @@ -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -+#include - #include - #include - #include ---- a/drivers/media/pci/bt8xx/bttv-driver.c -+++ b/drivers/media/pci/bt8xx/bttv-driver.c -@@ -34,8 +34,10 @@ - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -+#include - #include - #include - #include ---- a/drivers/media/pci/bt8xx/bttv-cards.c -+++ b/drivers/media/pci/bt8xx/bttv-cards.c -@@ -24,9 +24,10 @@ - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - */ -- -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -+#include - #include - #include - #include ---- a/drivers/media/dvb-frontends/nxt200x.c -+++ b/drivers/media/dvb-frontends/nxt200x.c -@@ -37,12 +37,14 @@ - * /usr/lib/hotplug/firmware/ or /lib/firmware/ - * (depending on configuration of firmware hotplug). - */ -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #define NXT2002_DEFAULT_FIRMWARE "dvb-fe-nxt2002.fw" - #define NXT2004_DEFAULT_FIRMWARE "dvb-fe-nxt2004.fw" - #define CRC_CCIT_MASK 0x1021 - -+#include - #include - #include - #include ---- a/drivers/media/dvb-frontends/or51211.c -+++ b/drivers/media/dvb-frontends/or51211.c -@@ -21,7 +21,7 @@ - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - */ -- -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": %s: " fmt, __func__ - - /* -@@ -32,6 +32,7 @@ - */ - #define OR51211_DEFAULT_FIRMWARE "dvb-fe-or51211.fw" - -+#include - #include - #include - #include ---- a/drivers/media/pci/bt8xx/bttv-risc.c -+++ b/drivers/media/pci/bt8xx/bttv-risc.c -@@ -23,9 +23,10 @@ - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - */ -- -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -+#include - #include - #include - #include ---- a/drivers/media/pci/bt8xx/bttv-vbi.c -+++ b/drivers/media/pci/bt8xx/bttv-vbi.c -@@ -22,9 +22,10 @@ - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -- -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -+#include - #include - #include - #include ---- a/drivers/media/pci/bt8xx/bttv-i2c.c -+++ b/drivers/media/pci/bt8xx/bttv-i2c.c -@@ -26,9 +26,10 @@ - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - */ -- -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -+#include - #include - #include - #include ---- a/drivers/media/pci/bt8xx/bttv-gpio.c -+++ b/drivers/media/pci/bt8xx/bttv-gpio.c -@@ -25,9 +25,10 @@ - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - */ -- -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -+#include - #include - #include - #include ---- a/drivers/media/pci/bt8xx/bttv-input.c -+++ b/drivers/media/pci/bt8xx/bttv-input.c -@@ -17,9 +17,10 @@ - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ -- -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -+#include - #include - #include - #include ---- a/drivers/media/pci/bt8xx/dvb-bt8xx.c -+++ b/drivers/media/pci/bt8xx/dvb-bt8xx.c -@@ -19,8 +19,10 @@ - * - */ - -+#undef pr_fmt - #define pr_fmt(fmt) "dvb_bt8xx: " fmt - -+#include - #include - #include - #include ---- a/drivers/media/common/siano/smsdvb-debugfs.c -+++ b/drivers/media/common/siano/smsdvb-debugfs.c -@@ -17,8 +17,10 @@ - * - ***********************************************************************/ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -+#include - #include - #include - #include ---- a/drivers/media/pci/cx25821/cx25821-alsa.c -+++ b/drivers/media/pci/cx25821/cx25821-alsa.c -@@ -20,8 +20,10 @@ - * - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -+#include - #include - #include - #include ---- a/drivers/media/pci/cx25821/cx25821-audio-upstream.c -+++ b/drivers/media/pci/cx25821/cx25821-audio-upstream.c -@@ -20,11 +20,13 @@ - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include "cx25821-video.h" - #include "cx25821-audio-upstream.h" - -+#include - #include - #include - #include ---- a/drivers/media/pci/cx25821/cx25821-cards.c -+++ b/drivers/media/pci/cx25821/cx25821-cards.c -@@ -21,8 +21,10 @@ - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -+#include - #include - #include - #include ---- a/drivers/media/pci/cx25821/cx25821-core.c -+++ b/drivers/media/pci/cx25821/cx25821-core.c -@@ -21,8 +21,10 @@ - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -+#include - #include - #include - #include "cx25821.h" ---- a/drivers/media/pci/cx25821/cx25821-i2c.c -+++ b/drivers/media/pci/cx25821/cx25821-i2c.c -@@ -21,9 +21,11 @@ - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include "cx25821.h" -+#include - #include - - static unsigned int i2c_debug; ---- a/drivers/media/pci/cx25821/cx25821-medusa-video.c -+++ b/drivers/media/pci/cx25821/cx25821-medusa-video.c -@@ -20,12 +20,15 @@ - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include "cx25821.h" - #include "cx25821-medusa-video.h" - #include "cx25821-biffuncs.h" - -+#include -+ - /* - * medusa_enable_bluefield_output() - * ---- a/drivers/media/pci/cx25821/cx25821-video.c -+++ b/drivers/media/pci/cx25821/cx25821-video.c -@@ -24,9 +24,11 @@ - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include "cx25821-video.h" -+#include - - MODULE_DESCRIPTION("v4l2 driver module for cx25821 based TV cards"); - MODULE_AUTHOR("Hiep Huynh "); ---- a/drivers/media/pci/cx25821/cx25821-video-upstream.c -+++ b/drivers/media/pci/cx25821/cx25821-video-upstream.c -@@ -20,11 +20,13 @@ - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include "cx25821-video.h" - #include "cx25821-video-upstream.h" - -+#include - #include - #include - #include ---- a/drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c -+++ b/drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c -@@ -20,11 +20,13 @@ - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include "cx25821-video.h" - #include "cx25821-video-upstream-ch2.h" - -+#include - #include - #include - #include ---- a/drivers/media/rc/imon.c -+++ b/drivers/media/rc/imon.c -@@ -26,8 +26,10 @@ - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ":%s: " fmt, __func__ - -+#include - #include - #include - #include ---- a/drivers/media/rc/fintek-cir.c -+++ b/drivers/media/rc/fintek-cir.c -@@ -23,8 +23,10 @@ - * USA - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -+#include - #include - #include - #include ---- a/drivers/media/rc/nuvoton-cir.c -+++ b/drivers/media/rc/nuvoton-cir.c -@@ -25,8 +25,10 @@ - * USA - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -+#include - #include - #include - #include ---- a/drivers/media/rc/ene_ir.c -+++ b/drivers/media/rc/ene_ir.c -@@ -30,8 +30,10 @@ - * - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -+#include - #include - #include - #include ---- a/drivers/media/rc/winbond-cir.c -+++ b/drivers/media/rc/winbond-cir.c -@@ -40,8 +40,10 @@ - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -+#include - #include - #include - #include ---- a/drivers/media/pci/saa7146/hexium_orion.c -+++ b/drivers/media/pci/saa7146/hexium_orion.c -@@ -21,11 +21,13 @@ - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #define DEBUG_VARIABLE debug - - #include -+#include - #include - - static int debug; ---- a/drivers/media/pci/saa7146/hexium_gemini.c -+++ b/drivers/media/pci/saa7146/hexium_gemini.c -@@ -21,12 +21,14 @@ - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #define DEBUG_VARIABLE debug - - #include - #include -+#include - - static int debug; - module_param(debug, int, 0); ---- a/drivers/media/pci/ttpci/budget-av.c -+++ b/drivers/media/pci/ttpci/budget-av.c -@@ -33,8 +33,10 @@ - * the project's page is at http://www.linuxtv.org/ - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -+#include - #include "budget.h" - #include "stv0299.h" - #include "stb0899_drv.h" ---- a/drivers/media/pci/ttpci/av7110_v4l.c -+++ b/drivers/media/pci/ttpci/av7110_v4l.c -@@ -25,8 +25,10 @@ - * the project's page is at http://www.linuxtv.org/ - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -+#include - #include - #include - #include diff --git a/patches/collateral-evolutions/network/53-pr_fmt/INFO b/patches/collateral-evolutions/network/53-pr_fmt/INFO deleted file mode 100644 index cd88ad54331b..000000000000 --- a/patches/collateral-evolutions/network/53-pr_fmt/INFO +++ /dev/null @@ -1,3 +0,0 @@ -This is the correct way to use pr_fmt. This helps avoid -compiler warnings. This is going to be sent upstream. - diff --git a/patches/collateral-evolutions/network/53-pr_fmt/drivers_bcma_bcma_private.patch b/patches/collateral-evolutions/network/53-pr_fmt/drivers_bcma_bcma_private.patch deleted file mode 100644 index 913deecf1586..000000000000 --- a/patches/collateral-evolutions/network/53-pr_fmt/drivers_bcma_bcma_private.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/drivers/bcma/bcma_private.h -+++ b/drivers/bcma/bcma_private.h -@@ -1,10 +1,10 @@ - #ifndef LINUX_BCMA_PRIVATE_H_ - #define LINUX_BCMA_PRIVATE_H_ - --#ifndef pr_fmt -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt --#endif - -+#include - #include - #include - diff --git a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_ethernet_broadcom_b44.patch b/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_ethernet_broadcom_b44.patch deleted file mode 100644 index 157905880805..000000000000 --- a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_ethernet_broadcom_b44.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/drivers/net/ethernet/broadcom/b44.c -+++ b/drivers/net/ethernet/broadcom/b44.c -@@ -10,9 +10,11 @@ - * Distribute under GPL. - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include -+#include - #include - #include - #include diff --git a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath5k_ani.patch b/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath5k_ani.patch deleted file mode 100644 index 53aee6451fc5..000000000000 --- a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath5k_ani.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/drivers/net/wireless/ath/ath5k/ani.c -+++ b/drivers/net/wireless/ath/ath5k/ani.c -@@ -14,8 +14,11 @@ - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -+#include -+ - #include "ath5k.h" - #include "reg.h" - #include "debug.h" diff --git a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath5k_attach.patch b/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath5k_attach.patch deleted file mode 100644 index 2c6ba9f26fbe..000000000000 --- a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath5k_attach.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/drivers/net/wireless/ath/ath5k/attach.c -+++ b/drivers/net/wireless/ath/ath5k/attach.c -@@ -20,8 +20,10 @@ - * Attach/Detach Functions and helpers * - \*************************************/ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -+#include - #include - #include - #include "ath5k.h" diff --git a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath5k_base.patch b/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath5k_base.patch deleted file mode 100644 index fd837ab659ac..000000000000 --- a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath5k_base.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/drivers/net/wireless/ath/ath5k/base.c -+++ b/drivers/net/wireless/ath/ath5k/base.c -@@ -40,8 +40,10 @@ - * - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -+#include - #include - #include - #include diff --git a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath5k_debug.patch b/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath5k_debug.patch deleted file mode 100644 index ff2d8dfd5b4e..000000000000 --- a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath5k_debug.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/drivers/net/wireless/ath/ath5k/debug.c -+++ b/drivers/net/wireless/ath/ath5k/debug.c -@@ -58,8 +58,10 @@ - * THE POSSIBILITY OF SUCH DAMAGES. - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -+#include - #include - #include - diff --git a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath5k_desc.patch b/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath5k_desc.patch deleted file mode 100644 index 034e4812165a..000000000000 --- a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath5k_desc.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/drivers/net/wireless/ath/ath5k/desc.c -+++ b/drivers/net/wireless/ath/ath5k/desc.c -@@ -21,8 +21,11 @@ - Hardware Descriptor Functions - \******************************/ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -+#include -+ - #include "ath5k.h" - #include "reg.h" - #include "debug.h" diff --git a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath5k_dma.patch b/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath5k_dma.patch deleted file mode 100644 index daaf54fc8ce1..000000000000 --- a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath5k_dma.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/drivers/net/wireless/ath/ath5k/dma.c -+++ b/drivers/net/wireless/ath/ath5k/dma.c -@@ -29,8 +29,11 @@ - * status registers (ISR). - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -+#include -+ - #include "ath5k.h" - #include "reg.h" - #include "debug.h" diff --git a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath5k_eeprom.patch b/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath5k_eeprom.patch deleted file mode 100644 index d05d207c7ae0..000000000000 --- a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath5k_eeprom.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/drivers/net/wireless/ath/ath5k/eeprom.c -+++ b/drivers/net/wireless/ath/ath5k/eeprom.c -@@ -21,8 +21,10 @@ - * EEPROM access functions and helpers * - \*************************************/ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -+#include - #include - - #include "ath5k.h" diff --git a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath5k_initvals.patch b/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath5k_initvals.patch deleted file mode 100644 index ba94dd3963c2..000000000000 --- a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath5k_initvals.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/drivers/net/wireless/ath/ath5k/initvals.c -+++ b/drivers/net/wireless/ath/ath5k/initvals.c -@@ -19,8 +19,11 @@ - * - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -+#include -+ - #include "ath5k.h" - #include "reg.h" - #include "debug.h" diff --git a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath5k_led.patch b/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath5k_led.patch deleted file mode 100644 index 05b91bf5bb98..000000000000 --- a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath5k_led.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/drivers/net/wireless/ath/ath5k/led.c -+++ b/drivers/net/wireless/ath/ath5k/led.c -@@ -39,8 +39,10 @@ - * - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -+#include - #include - #include "ath5k.h" - diff --git a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath5k_mac80211-ops.patch b/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath5k_mac80211-ops.patch deleted file mode 100644 index a11835bb0122..000000000000 --- a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath5k_mac80211-ops.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/drivers/net/wireless/ath/ath5k/mac80211-ops.c -+++ b/drivers/net/wireless/ath/ath5k/mac80211-ops.c -@@ -41,11 +41,14 @@ - * - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include - #include - -+#include -+ - #include "ath5k.h" - #include "base.h" - #include "reg.h" diff --git a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath5k_pci.patch b/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath5k_pci.patch deleted file mode 100644 index 3affa135f2b7..000000000000 --- a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath5k_pci.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/drivers/net/wireless/ath/ath5k/pci.c -+++ b/drivers/net/wireless/ath/ath5k/pci.c -@@ -14,8 +14,10 @@ - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -+#include - #include - #include - #include diff --git a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath5k_phy.patch b/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath5k_phy.patch deleted file mode 100644 index 84ab4dbb2515..000000000000 --- a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath5k_phy.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/drivers/net/wireless/ath/ath5k/phy.c -+++ b/drivers/net/wireless/ath/ath5k/phy.c -@@ -22,8 +22,10 @@ - * PHY related functions * - \***********************/ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -+#include - #include - #include - #include diff --git a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath5k_qcu.patch b/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath5k_qcu.patch deleted file mode 100644 index 92ae2fb0cbdc..000000000000 --- a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath5k_qcu.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/drivers/net/wireless/ath/ath5k/qcu.c -+++ b/drivers/net/wireless/ath/ath5k/qcu.c -@@ -20,8 +20,11 @@ - Queue Control Unit, DCF Control Unit Functions - \********************************************/ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -+#include -+ - #include "ath5k.h" - #include "reg.h" - #include "debug.h" diff --git a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath5k_reset.patch b/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath5k_reset.patch deleted file mode 100644 index 852fa3e2dbf9..000000000000 --- a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath5k_reset.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/drivers/net/wireless/ath/ath5k/reset.c -+++ b/drivers/net/wireless/ath/ath5k/reset.c -@@ -23,10 +23,12 @@ - Reset function and helpers - \****************************/ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include - -+#include - #include /* To determine if a card is pci-e */ - #include - #include diff --git a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath5k_sysfs.patch b/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath5k_sysfs.patch deleted file mode 100644 index b7782bdf6bd0..000000000000 --- a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath5k_sysfs.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/drivers/net/wireless/ath/ath5k/sysfs.c -+++ b/drivers/net/wireless/ath/ath5k/sysfs.c -@@ -1,5 +1,7 @@ -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -+#include - #include - #include - diff --git a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath6kl_cfg80211.patch b/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath6kl_cfg80211.patch deleted file mode 100644 index be1d7b35bf98..000000000000 --- a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath6kl_cfg80211.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- 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 - #include - #include - #include diff --git a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath6kl_init.patch b/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath6kl_init.patch deleted file mode 100644 index b754cfdd044c..000000000000 --- a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath6kl_init.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- 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 - #include - #include - #include diff --git a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath6kl_main.patch b/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath6kl_main.patch deleted file mode 100644 index 1490bb3eeb33..000000000000 --- a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath6kl_main.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- 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 -+ - #include "core.h" - #include "hif-ops.h" - #include "cfg80211.h" diff --git a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath6kl_txrx.patch b/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath6kl_txrx.patch deleted file mode 100644 index 7a6fd422ea90..000000000000 --- a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath6kl_txrx.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- 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 -+ - #include "core.h" - #include "debug.h" - #include "htc-ops.h" diff --git a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath9k_htc_drv_init.patch b/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath9k_htc_drv_init.patch deleted file mode 100644 index c1298567b0fb..000000000000 --- a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath9k_htc_drv_init.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c -+++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c -@@ -14,8 +14,11 @@ - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -+#include -+ - #include "htc.h" - - MODULE_AUTHOR("Atheros Communications"); diff --git a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath9k_htc_hst.patch b/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath9k_htc_hst.patch deleted file mode 100644 index b88569ae73a8..000000000000 --- a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath9k_htc_hst.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/drivers/net/wireless/ath/ath9k/htc_hst.c -+++ b/drivers/net/wireless/ath/ath9k/htc_hst.c -@@ -14,8 +14,11 @@ - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -+#include -+ - #include "htc.h" - - static int htc_issue_send(struct htc_target *target, struct sk_buff* skb, diff --git a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath9k_init.patch b/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath9k_init.patch deleted file mode 100644 index 7de038eed6e5..000000000000 --- a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath9k_init.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/drivers/net/wireless/ath/ath9k/init.c -+++ b/drivers/net/wireless/ath/ath9k/init.c -@@ -14,8 +14,10 @@ - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -+#include - #include - #include - #include diff --git a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath9k_pci.patch b/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath9k_pci.patch deleted file mode 100644 index 45d362b37939..000000000000 --- a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_ath9k_pci.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/drivers/net/wireless/ath/ath9k/pci.c -+++ b/drivers/net/wireless/ath/ath9k/pci.c -@@ -14,8 +14,10 @@ - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -+#include - #include - #include - #include diff --git a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_main.patch b/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_main.patch deleted file mode 100644 index 1fd91709a109..000000000000 --- a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_main.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/drivers/net/wireless/ath/main.c -+++ b/drivers/net/wireless/ath/main.c -@@ -14,9 +14,11 @@ - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include -+#include - #include - - #include "ath.h" diff --git a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_regd.patch b/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_regd.patch deleted file mode 100644 index c147951c73ed..000000000000 --- a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_ath_regd.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/drivers/net/wireless/ath/regd.c -+++ b/drivers/net/wireless/ath/regd.c -@@ -14,9 +14,11 @@ - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include -+#include - #include - #include - #include diff --git a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_brcm80211_brcmsmac_aiutils.patch b/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_brcm80211_brcmsmac_aiutils.patch deleted file mode 100644 index eb604a1d2eb7..000000000000 --- a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_brcm80211_brcmsmac_aiutils.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c -+++ b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c -@@ -16,8 +16,10 @@ - * File contents: support functions for PCI/PCIe - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -+#include - #include - - #include diff --git a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_brcm80211_brcmsmac_mac80211_if.patch b/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_brcm80211_brcmsmac_mac80211_if.patch deleted file mode 100644 index bcd4f84694a1..000000000000 --- a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_brcm80211_brcmsmac_mac80211_if.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c -+++ b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c -@@ -16,8 +16,10 @@ - */ - - #define __UNDEF_NO_VERSION__ -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -+#include - #include - #include - #include diff --git a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_brcm80211_brcmsmac_main.patch b/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_brcm80211_brcmsmac_main.patch deleted file mode 100644 index 5a33c9c3439c..000000000000 --- a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_brcm80211_brcmsmac_main.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/drivers/net/wireless/brcm80211/brcmsmac/main.c -+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c -@@ -15,8 +15,10 @@ - * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -+#include - #include - #include - #include diff --git a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_brcm80211_brcmsmac_phy_phy_n.patch b/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_brcm80211_brcmsmac_phy_phy_n.patch deleted file mode 100644 index 090eae88dedf..000000000000 --- a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_brcm80211_brcmsmac_phy_phy_n.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c -+++ b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.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 -+#include - #include - #include - diff --git a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_brcm80211_brcmutil_utils.patch b/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_brcm80211_brcmutil_utils.patch deleted file mode 100644 index 9d6ed2967124..000000000000 --- a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_brcm80211_brcmutil_utils.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/drivers/net/wireless/brcm80211/brcmutil/utils.c -+++ b/drivers/net/wireless/brcm80211/brcmutil/utils.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 - #include - #include - diff --git a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_iwlegacy_3945-mac.patch b/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_iwlegacy_3945-mac.patch deleted file mode 100644 index 90afaff676da..000000000000 --- a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_iwlegacy_3945-mac.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/drivers/net/wireless/iwlegacy/3945-mac.c -+++ b/drivers/net/wireless/iwlegacy/3945-mac.c -@@ -27,9 +27,11 @@ - * - *****************************************************************************/ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include -+#include - #include - #include - #include diff --git a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_iwlegacy_4965-mac.patch b/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_iwlegacy_4965-mac.patch deleted file mode 100644 index 6b44e957016c..000000000000 --- a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_iwlegacy_4965-mac.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/drivers/net/wireless/iwlegacy/4965-mac.c -+++ b/drivers/net/wireless/iwlegacy/4965-mac.c -@@ -27,9 +27,11 @@ - * - *****************************************************************************/ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include -+#include - #include - #include - #include diff --git a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_iwlwifi_dvm_main.patch b/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_iwlwifi_dvm_main.patch deleted file mode 100644 index 74429ebe71c0..000000000000 --- a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_iwlwifi_dvm_main.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/drivers/net/wireless/iwlwifi/dvm/main.c -+++ b/drivers/net/wireless/iwlwifi/dvm/main.c -@@ -27,8 +27,10 @@ - * - *****************************************************************************/ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -+#include - #include - #include - #include diff --git a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_iwlwifi_pcie_drv.patch b/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_iwlwifi_pcie_drv.patch deleted file mode 100644 index 0e06ca39ccf9..000000000000 --- a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_iwlwifi_pcie_drv.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/drivers/net/wireless/iwlwifi/pcie/drv.c -+++ b/drivers/net/wireless/iwlwifi/pcie/drv.c -@@ -61,8 +61,10 @@ - * - *****************************************************************************/ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -+#include - #include - #include - #include diff --git a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_libertas_cfg.patch b/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_libertas_cfg.patch deleted file mode 100644 index d5250c54d672..000000000000 --- a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_libertas_cfg.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/drivers/net/wireless/libertas/cfg.c -+++ b/drivers/net/wireless/libertas/cfg.c -@@ -6,8 +6,10 @@ - * - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -+#include - #include - #include - #include diff --git a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_libertas_if_cs.patch b/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_libertas_if_cs.patch deleted file mode 100644 index 90063951bf6a..000000000000 --- a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_libertas_if_cs.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/drivers/net/wireless/libertas/if_cs.c -+++ b/drivers/net/wireless/libertas/if_cs.c -@@ -21,8 +21,10 @@ - - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -+#include - #include - #include - #include diff --git a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_libertas_if_sdio.patch b/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_libertas_if_sdio.patch deleted file mode 100644 index 13f793c7caf6..000000000000 --- a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_libertas_if_sdio.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/drivers/net/wireless/libertas/if_sdio.c -+++ b/drivers/net/wireless/libertas/if_sdio.c -@@ -26,9 +26,11 @@ - * if_sdio_card_to_host() to pad the data. - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include -+#include - #include - #include - #include diff --git a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_libertas_if_spi.patch b/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_libertas_if_spi.patch deleted file mode 100644 index 0946aab6f4b1..000000000000 --- a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_libertas_if_spi.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/drivers/net/wireless/libertas/if_spi.c -+++ b/drivers/net/wireless/libertas/if_spi.c -@@ -17,8 +17,10 @@ - * (at your option) any later version. - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -+#include - #include - #include - #include diff --git a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_libertas_if_usb.patch b/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_libertas_if_usb.patch deleted file mode 100644 index a53b31103d85..000000000000 --- a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_libertas_if_usb.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/drivers/net/wireless/libertas/if_usb.c -+++ b/drivers/net/wireless/libertas/if_usb.c -@@ -2,8 +2,10 @@ - * This file contains functions used in USB interface module. - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -+#include - #include - #include - #include diff --git a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_libertas_main.patch b/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_libertas_main.patch deleted file mode 100644 index a3837c957ce1..000000000000 --- a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_libertas_main.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/drivers/net/wireless/libertas/main.c -+++ b/drivers/net/wireless/libertas/main.c -@@ -4,8 +4,10 @@ - * thread etc.. - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -+#include - #include - #include - #include diff --git a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_libertas_mesh.patch b/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_libertas_mesh.patch deleted file mode 100644 index 3e3b7e63481c..000000000000 --- a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_libertas_mesh.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/drivers/net/wireless/libertas/mesh.c -+++ b/drivers/net/wireless/libertas/mesh.c -@@ -1,5 +1,7 @@ -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -+#include - #include - #include - #include diff --git a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_libertas_rx.patch b/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_libertas_rx.patch deleted file mode 100644 index eb81eaa536c0..000000000000 --- a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_libertas_rx.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/drivers/net/wireless/libertas/rx.c -+++ b/drivers/net/wireless/libertas/rx.c -@@ -2,8 +2,10 @@ - * This file contains the handling of RX in wlan driver. - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -+#include - #include - #include - #include diff --git a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_libertas_tf_cmd.patch b/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_libertas_tf_cmd.patch deleted file mode 100644 index 27e8d844692e..000000000000 --- a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_libertas_tf_cmd.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/drivers/net/wireless/libertas_tf/cmd.c -+++ b/drivers/net/wireless/libertas_tf/cmd.c -@@ -7,8 +7,10 @@ - * 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 - -+#include - #include - #include - #include diff --git a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_libertas_tf_if_usb.patch b/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_libertas_tf_if_usb.patch deleted file mode 100644 index 4d2fdf48a9f4..000000000000 --- a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_libertas_tf_if_usb.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/drivers/net/wireless/libertas_tf/if_usb.c -+++ b/drivers/net/wireless/libertas_tf/if_usb.c -@@ -9,11 +9,13 @@ - */ - #define DRV_NAME "lbtf_usb" - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include "libertas_tf.h" - #include "if_usb.h" - -+#include - #include - #include - #include diff --git a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_libertas_tf_main.patch b/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_libertas_tf_main.patch deleted file mode 100644 index 88c9fd344aa2..000000000000 --- a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_libertas_tf_main.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/drivers/net/wireless/libertas_tf/main.c -+++ b/drivers/net/wireless/libertas_tf/main.c -@@ -7,8 +7,10 @@ - * 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 - -+#include - #include - #include - diff --git a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_rtlwifi_wifi.patch b/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_rtlwifi_wifi.patch deleted file mode 100644 index bed0b2941c1e..000000000000 --- a/patches/collateral-evolutions/network/53-pr_fmt/drivers_net_wireless_rtlwifi_wifi.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/drivers/net/wireless/rtlwifi/wifi.h -+++ b/drivers/net/wireless/rtlwifi/wifi.h -@@ -30,8 +30,10 @@ - #ifndef __RTL_WIFI_H__ - #define __RTL_WIFI_H__ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -+#include - #include - #include - #include diff --git a/patches/collateral-evolutions/network/53-pr_fmt/net_bluetooth_lib.patch b/patches/collateral-evolutions/network/53-pr_fmt/net_bluetooth_lib.patch deleted file mode 100644 index 8492b14dfa13..000000000000 --- a/patches/collateral-evolutions/network/53-pr_fmt/net_bluetooth_lib.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/net/bluetooth/lib.c -+++ b/net/bluetooth/lib.c -@@ -24,9 +24,11 @@ - - /* Bluetooth kernel library. */ - -+#undef pr_fmt - #define pr_fmt(fmt) "Bluetooth: " fmt - - #include -+#include - - #include - diff --git a/patches/collateral-evolutions/network/53-pr_fmt/net_wireless_core.patch b/patches/collateral-evolutions/network/53-pr_fmt/net_wireless_core.patch deleted file mode 100644 index cc37a50e607c..000000000000 --- a/patches/collateral-evolutions/network/53-pr_fmt/net_wireless_core.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/net/wireless/core.c -+++ b/net/wireless/core.c -@@ -4,8 +4,10 @@ - * Copyright 2006-2010 Johannes Berg - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -+#include - #include - #include - #include diff --git a/patches/collateral-evolutions/network/53-pr_fmt/net_wireless_lib80211.patch b/patches/collateral-evolutions/network/53-pr_fmt/net_wireless_lib80211.patch deleted file mode 100644 index 29a3604a91e0..000000000000 --- a/patches/collateral-evolutions/network/53-pr_fmt/net_wireless_lib80211.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/net/wireless/lib80211.c -+++ b/net/wireless/lib80211.c -@@ -13,8 +13,10 @@ - * - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -+#include - #include - #include - #include diff --git a/patches/collateral-evolutions/network/53-pr_fmt/net_wireless_lib80211_crypt_tkip.patch b/patches/collateral-evolutions/network/53-pr_fmt/net_wireless_lib80211_crypt_tkip.patch deleted file mode 100644 index a5d56eef4967..000000000000 --- a/patches/collateral-evolutions/network/53-pr_fmt/net_wireless_lib80211_crypt_tkip.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/net/wireless/lib80211_crypt_tkip.c -+++ b/net/wireless/lib80211_crypt_tkip.c -@@ -10,8 +10,10 @@ - * more details. - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -+#include - #include - #include - #include diff --git a/patches/collateral-evolutions/network/53-pr_fmt/net_wireless_reg.patch b/patches/collateral-evolutions/network/53-pr_fmt/net_wireless_reg.patch deleted file mode 100644 index 168b4d17a17c..000000000000 --- a/patches/collateral-evolutions/network/53-pr_fmt/net_wireless_reg.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/net/wireless/reg.c -+++ b/net/wireless/reg.c -@@ -42,9 +42,11 @@ - * - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include -+#include - #include - #include - #include diff --git a/patches/collateral-evolutions/nfc/02-pr_fmt/INFO b/patches/collateral-evolutions/nfc/02-pr_fmt/INFO deleted file mode 100644 index d7895f41e4e4..000000000000 --- a/patches/collateral-evolutions/nfc/02-pr_fmt/INFO +++ /dev/null @@ -1,6 +0,0 @@ - -Undef/define/include printk.h for fixing redefinition warnings -during build. - -Patch adapted from compat-wireless tree. - diff --git a/patches/collateral-evolutions/nfc/02-pr_fmt/net_nfc.patch b/patches/collateral-evolutions/nfc/02-pr_fmt/net_nfc.patch deleted file mode 100644 index 94544a3ff467..000000000000 --- a/patches/collateral-evolutions/nfc/02-pr_fmt/net_nfc.patch +++ /dev/null @@ -1,181 +0,0 @@ ---- a/net/nfc/core.c -+++ b/net/nfc/core.c -@@ -21,8 +21,10 @@ - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": %s: " fmt, __func__ - -+#include - #include - #include - #include ---- a/net/nfc/hci/command.c -+++ b/net/nfc/hci/command.c -@@ -17,8 +17,10 @@ - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -+#undef pr_fmt - #define pr_fmt(fmt) "hci: %s: " fmt, __func__ - -+#include - #include - #include - #include ---- a/net/nfc/hci/core.c -+++ b/net/nfc/hci/core.c -@@ -17,8 +17,10 @@ - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -+#undef pr_fmt - #define pr_fmt(fmt) "hci: %s: " fmt, __func__ - -+#include - #include - #include - #include ---- a/net/nfc/hci/hcp.c -+++ b/net/nfc/hci/hcp.c -@@ -17,8 +17,10 @@ - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -+#undef pr_fmt - #define pr_fmt(fmt) "hci: %s: " fmt, __func__ - -+#include - #include - #include - #include ---- a/net/nfc/hci/llc_shdlc.c -+++ b/net/nfc/hci/llc_shdlc.c -@@ -18,8 +18,10 @@ - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -+#undef pr_fmt - #define pr_fmt(fmt) "shdlc: %s: " fmt, __func__ - -+#include - #include - #include - #include ---- a/net/nfc/llcp/commands.c -+++ b/net/nfc/llcp/commands.c -@@ -17,8 +17,10 @@ - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -+#undef pr_fmt - #define pr_fmt(fmt) "llcp: %s: " fmt, __func__ - -+#include - #include - #include - #include ---- a/net/nfc/llcp/llcp.c -+++ b/net/nfc/llcp/llcp.c -@@ -17,8 +17,10 @@ - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -+#undef pr_fmt - #define pr_fmt(fmt) "llcp: %s: " fmt, __func__ - -+#include - #include - #include - #include ---- a/net/nfc/llcp/sock.c -+++ b/net/nfc/llcp/sock.c -@@ -17,8 +17,10 @@ - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -+#undef pr_fmt - #define pr_fmt(fmt) "llcp: %s: " fmt, __func__ - -+#include - #include - #include - #include ---- a/net/nfc/nci/core.c -+++ b/net/nfc/nci/core.c -@@ -25,8 +25,10 @@ - * - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": %s: " fmt, __func__ - -+#include - #include - #include - #include ---- a/net/nfc/nci/data.c -+++ b/net/nfc/nci/data.c -@@ -21,8 +21,10 @@ - * - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": %s: " fmt, __func__ - -+#include - #include - #include - #include ---- a/net/nfc/nci/ntf.c -+++ b/net/nfc/nci/ntf.c -@@ -25,8 +25,10 @@ - * - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": %s: " fmt, __func__ - -+#include - #include - #include - #include ---- a/net/nfc/nci/rsp.c -+++ b/net/nfc/nci/rsp.c -@@ -25,7 +25,9 @@ - * - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": %s: " fmt, __func__ -+#include - - #include - #include ---- a/net/nfc/netlink.c -+++ b/net/nfc/netlink.c -@@ -21,8 +21,10 @@ - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": %s: " fmt, __func__ - -+#include - #include - #include - #include ---- a/net/nfc/rawsock.c -+++ b/net/nfc/rawsock.c -@@ -21,8 +21,10 @@ - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": %s: " fmt, __func__ - -+#include - #include - #include - #include