summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@redhat.com>2016-12-14 17:07:05 -0600
committerJustin M. Forbes <jforbes@redhat.com>2016-12-14 17:07:05 -0600
commitcabf9a05061f9d09322e9f2888ed887e51570a62 (patch)
treeb616019b43cd940f5961bb8e81170dd0a573e008
parent962ea4f047b3b4b4360446be4289c4e4deb29551 (diff)
downloadkernel-cabf9a05061f9d09322e9f2888ed887e51570a62.tar.gz
kernel-cabf9a05061f9d09322e9f2888ed887e51570a62.tar.xz
kernel-cabf9a05061f9d09322e9f2888ed887e51570a62.zip
Fix build issue with armada_trace
-rw-r--r--Armada-trace-build-fix.patch20
-rw-r--r--kernel.spec3
2 files changed, 23 insertions, 0 deletions
diff --git a/Armada-trace-build-fix.patch b/Armada-trace-build-fix.patch
new file mode 100644
index 000000000..f78b121c0
--- /dev/null
+++ b/Armada-trace-build-fix.patch
@@ -0,0 +1,20 @@
+From: Fedora Kernel Team <kernel-team@fedoraproject.org>
+Date: Wed, 14 Dec 2016 16:53:21 -0600
+Subject: [PATCH] Armada trace build fix
+
+---
+ drivers/gpu/drm/armada/Makefile | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/drivers/gpu/drm/armada/Makefile b/drivers/gpu/drm/armada/Makefile
+--- a/drivers/gpu/drm/armada/Makefile
++++ b/drivers/gpu/drm/armada/Makefile
+@@ -4,3 +4,5 @@ armada-y += armada_510.o
+ armada-$(CONFIG_DEBUG_FS) += armada_debugfs.o
+
+ obj-$(CONFIG_DRM_ARMADA) := armada.o
++
++CFLAGS_armada_trace.o := -I$(src)
+--
+2.9.3
+
diff --git a/kernel.spec b/kernel.spec
index f9409951f..adaf471f4 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -587,6 +587,9 @@ Patch849: 0001-iio-Use-event-header-from-kernel-tree.patch
# Work around thinkpad firmware memory layout issues and efi_mem_reserve()
Patch850: 0001-efi-prune-invalid-memory-map-entries.patch
+# Fix build issue with armada_trace
+Patch851: Armada-trace-build-fix.patch
+
# END OF PATCH DEFINITIONS
%endif