diff options
author | Johannes Berg <johannes.berg@intel.com> | 2013-04-12 01:12:15 +0200 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2013-04-15 11:32:46 +0200 |
commit | e07361fd59804d10b759f4be1a7d2ddf703881b4 (patch) | |
tree | 687e2e8ffc7bd49c7144046e5bc8dab483d0996a /patches/collateral-evolutions/drm | |
parent | cd4689f3d34d36b1531d3d82a700523f1b931917 (diff) |
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 <johannes.berg@intel.com>
Diffstat (limited to 'patches/collateral-evolutions/drm')
14 files changed, 0 insertions, 189 deletions
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 d7895f41..00000000 --- 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 49af9e73..00000000 --- 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 <airlied@linux.ie> - * Jesse Barnes <jesse.barnes@intel.com> - */ -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - - #include <linux/kernel.h> -+#include <linux/printk.h> - #include <linux/sysrq.h> - #include <linux/slab.h> - #include <linux/fb.h> 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 df64c810..00000000 --- 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 <drm/drmP.h> -@@ -35,6 +36,7 @@ - #include <drm/i915_drm.h> - #include "i915_drv.h" - #include "i915_trace.h" -+#include <linux/printk.h> - #include <linux/pci.h> - #include <linux/vgaarb.h> - #include <linux/acpi.h> 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 923a8b49..00000000 --- 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 <linux/printk.h> - #include <linux/sysrq.h> - #include <linux/slab.h> - #include <drm/drmP.h> 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 8279c93b..00000000 --- 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 <linux/printk.h> - #include <linux/acpi.h> - #include <linux/acpi_io.h> - #include <acpi/video.h> 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 3a87d9f7..00000000 --- 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 <chris@chris-wilson.co.uk> - */ - -+#undef pr_fmt - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -+#include <linux/printk.h> - #include <linux/moduleparam.h> - #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 d4a791e4..00000000 --- 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 <linux/printk.h> - #include <drm/ttm/ttm_module.h> - #include <drm/ttm/ttm_bo_driver.h> - #include <drm/ttm/ttm_page_alloc.h> 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 ac5cb1d6..00000000 --- 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 <thellstrom-at-vmware-dot-com> - */ - -+#undef pr_fmt - #define pr_fmt(fmt) "[TTM] " fmt - - #include <drm/ttm/ttm_module.h> - #include <drm/ttm/ttm_bo_driver.h> - #include <drm/ttm/ttm_placement.h> -+#include <linux/printk.h> - #include <linux/jiffies.h> - #include <linux/slab.h> - #include <linux/sched.h> 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 45c5f053..00000000 --- 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 <thellstrom-at-vmware-dot-com> - */ - -+#undef pr_fmt - #define pr_fmt(fmt) "[TTM] " fmt - -+#include <linux/printk.h> - #include <ttm/ttm_module.h> - #include <ttm/ttm_bo_driver.h> - #include <ttm/ttm_placement.h> 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 ce492cb5..00000000 --- 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 <drm/ttm/ttm_memory.h> - #include <drm/ttm/ttm_module.h> - #include <drm/ttm/ttm_page_alloc.h> -+#include <linux/printk.h> - #include <linux/spinlock.h> - #include <linux/sched.h> - #include <linux/wait.h> 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 7c8ed998..00000000 --- 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 <drm/ttm/ttm_object.h> - #include <drm/ttm/ttm_module.h> -+#include <linux/printk.h> - #include <linux/list.h> - #include <linux/spinlock.h> - #include <linux/slab.h> 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 35565383..00000000 --- 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 <linux/printk.h> - #include <linux/list.h> - #include <linux/spinlock.h> - #include <linux/highmem.h> 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 a2c700a1..00000000 --- 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 <linux/printk.h> - #include <linux/dma-mapping.h> - #include <linux/list.h> - #include <linux/seq_file.h> /* 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 2925d7db..00000000 --- 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 <thellstrom-at-vmware-dot-com> - */ - -+#undef pr_fmt - #define pr_fmt(fmt) "[TTM] " fmt - -+#include <linux/printk.h> - #include <linux/sched.h> - #include <linux/highmem.h> - #include <linux/pagemap.h> |