From bb5044768cb4ab2f0154b7759f41f157bd4eb91c Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Thu, 16 May 2013 15:30:03 -0700 Subject: [PATCH] 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 Signed-off-by: Johannes Berg --- .../drm/13-nouveau-include-fix/INFO | 2 ++ .../drivers_gpu_drm_nouveau_Makefile.patch | 11 +++++++++++ 2 files changed, 13 insertions(+) create mode 100644 patches/collateral-evolutions/drm/13-nouveau-include-fix/INFO create mode 100644 patches/collateral-evolutions/drm/13-nouveau-include-fix/drivers_gpu_drm_nouveau_Makefile.patch 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 000000000000..9fda4df1df76 --- /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 000000000000..dace69b1037b --- /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) -- 2.30.2