media: Avoid ABI change in 3.10.13

svn path=/dists/sid/linux/; revision=20683
This commit is contained in:
Ben Hutchings 2013-09-29 20:40:48 +00:00
parent f066e98ffa
commit bd39d353ae
2 changed files with 22 additions and 0 deletions

View File

@ -0,0 +1,20 @@
From: Ben Hutchings <ben@decadent.org.uk>
Subject: media: Avoid ABI change in 3.10.13
Forwarded: not-needed
genksyms tends to change symbol versions when a new #include is added.
I didn't see any changes on amd64, but just to be careful let's hide
this.
--- a/include/media/v4l2-ctrls.h
+++ b/include/media/v4l2-ctrls.h
@@ -22,7 +22,9 @@
#define _V4L2_CTRLS_H
#include <linux/list.h>
+#ifndef __GENKSYMS__
#include <linux/mutex.h>
+#endif
#include <linux/videodev2.h>
/* forward references */

View File

@ -120,4 +120,6 @@ bugfix/arm/ARM-Fix-the-world-famous-typo-with-is_gate_vma.patch
# ABI stability
debian/net-sched-avoid-abi-change-in-3.10.12.patch
debian/revert-genl-hold-reference-on-correct-module.patch
debian/media-avoid-abi-change-in-3.10.13.patch
features/all/mvsas-Recognise-device-subsystem-9485-9485-as-88SE94.patch