summaryrefslogtreecommitdiff
path: root/patches
diff options
context:
space:
mode:
authorLuis R. Rodriguez <mcgrof@do-not-panic.com>2013-05-16 15:30:03 -0700
committerJohannes Berg <johannes.berg@intel.com>2013-05-17 14:06:27 +0200
commitbb5044768cb4ab2f0154b7759f41f157bd4eb91c (patch)
tree8e3ec32d5404796305244c97a40013975a6b1e5c /patches
parent260f9bf9933bf35d09b40f22993364af33fe01ca (diff)
backports: address nouveau file shuffling
The recent file shuffling on nouveau requires some changes not upstream to get it to compile to ensure some objects do get interpreted as requiring the new search path. Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'patches')
-rw-r--r--patches/collateral-evolutions/drm/13-nouveau-include-fix/INFO2
-rw-r--r--patches/collateral-evolutions/drm/13-nouveau-include-fix/drivers_gpu_drm_nouveau_Makefile.patch11
2 files changed, 13 insertions, 0 deletions
diff --git a/patches/collateral-evolutions/drm/13-nouveau-include-fix/INFO b/patches/collateral-evolutions/drm/13-nouveau-include-fix/INFO
new file mode 100644
index 00000000..9fda4df1
--- /dev/null
+++ b/patches/collateral-evolutions/drm/13-nouveau-include-fix/INFO
@@ -0,0 +1,2 @@
+The headers are not being picked up and require
+ensuring we are pointing to our backport selection.
diff --git a/patches/collateral-evolutions/drm/13-nouveau-include-fix/drivers_gpu_drm_nouveau_Makefile.patch b/patches/collateral-evolutions/drm/13-nouveau-include-fix/drivers_gpu_drm_nouveau_Makefile.patch
new file mode 100644
index 00000000..dace69b1
--- /dev/null
+++ b/patches/collateral-evolutions/drm/13-nouveau-include-fix/drivers_gpu_drm_nouveau_Makefile.patch
@@ -0,0 +1,11 @@
+--- a/drivers/gpu/drm/nouveau/Makefile
++++ b/drivers/gpu/drm/nouveau/Makefile
+@@ -2,7 +2,7 @@
+ # Makefile for the drm device driver. This driver provides support for the
+ # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
+
+-ccflags-y := -Iinclude/drm
++ccflags-y += -I$(backport_srctree)/include/drm
+ ccflags-y += -I$(src)/core/include
+ ccflags-y += -I$(src)/core
+ ccflags-y += -I$(src)