summaryrefslogtreecommitdiff
path: root/linux
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@linuxtv.org>2006-02-06 14:00:54 -0500
committerMichael Krufky <mkrufky@linuxtv.org>2006-02-06 14:00:54 -0500
commitf1e940da2ce33a9b48e62632c7f838b298097609 (patch)
tree483e1ee1f436d6f401164f6b273ec46355eb1844 /linux
parent07abcf5c5153b9aac670a186c3a9f4eb7be2917b (diff)
downloadmediapointer-dvb-s2-f1e940da2ce33a9b48e62632c7f838b298097609.tar.gz
mediapointer-dvb-s2-f1e940da2ce33a9b48e62632c7f838b298097609.tar.bz2
sem2mutex: fix local build and backwards-compatability
From: Michael Krufky <mkrufky@linuxtv.org> Patch 3320 breaks our repository. This should fix it. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Diffstat (limited to 'linux')
-rw-r--r--linux/drivers/media/video/cx88/cx88.h4
-rw-r--r--linux/include/media/video-buf-dvb.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/linux/drivers/media/video/cx88/cx88.h b/linux/drivers/media/video/cx88/cx88.h
index e9300a2bc..7a7219377 100644
--- a/linux/drivers/media/video/cx88/cx88.h
+++ b/linux/drivers/media/video/cx88/cx88.h
@@ -39,7 +39,7 @@
#include "cx88-reg.h"
#include <linux/version.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
#include <linux/mutex.h>
#endif
#define CX88_VERSION_CODE KERNEL_VERSION(0,0,5)
@@ -322,7 +322,7 @@ struct cx88_core {
/* IR remote control state */
struct cx88_IR *ir;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
struct mutex lock;
#else
struct semaphore lock;
diff --git a/linux/include/media/video-buf-dvb.h b/linux/include/media/video-buf-dvb.h
index 49cb08d75..8dcaad6a1 100644
--- a/linux/include/media/video-buf-dvb.h
+++ b/linux/include/media/video-buf-dvb.h
@@ -12,7 +12,7 @@ struct videobuf_dvb {
struct videobuf_queue dvbq;
/* video-buf-dvb state info */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
struct mutex lock;
#else
struct semaphore lock;