← Back to branch summary

~ubuntu-branches/ubuntu/trusty/dahdi-linux/trusty-proposed

« back to all changes in this revision

Viewing changes to debian/patches/voicebus_sem_h_2635

  • Committer: Stefan Lesicnik
  • Date: 2010-11-10 13:41:13 UTC
  • mfrom: (3.1.5 sid)
  • Revision ID: stefan@lsd.co.za-20101110134113-esykqtd368dxm2vp
bzr merge of Debian 1:2.3.0.1+dfsg-2

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/voicebus_sem_h_2635
 
1
Subject: include semaphore.h explicitly for newer kernels
 
2
Origin: http://svn.asterisk.org/svn/dahdi/linux/trunk@8758 
 
3
Bug: https://issues.asterisk.org/view.php?id=17382
 
4
 
 
5
With kernel version >= 2.6.35-rc1, building failed with:
 
6
 
 
7
  drivers/dahdi/voicebus/GpakCust.h:114: error: field ‘sem’ has incomplete type
 
8
 
 
9
Reported by: Chainsaw
 
10
Patches:
 
11
      07-semaphore-include-not-optional.diff uploaded by Chainsaw (license 723)
 
12
 
 
13
---
 
14
 drivers/dahdi/voicebus/GpakCust.h |    5 +++++
 
15
 1 files changed, 5 insertions(+), 0 deletions(-)
 
16
 
 
17
diff --git a/drivers/dahdi/voicebus/GpakCust.h b/drivers/dahdi/voicebus/GpakCust.h
 
18
index 2b28480..64ef44a 100644
 
19
--- a/drivers/dahdi/voicebus/GpakCust.h
 
20
+++ b/drivers/dahdi/voicebus/GpakCust.h
 
21
@@ -40,6 +40,11 @@
 
22
 #include <linux/completion.h>
 
23
 #include <linux/workqueue.h>
 
24
 #include <linux/delay.h>
 
25
+#include <linux/version.h>
 
26
+
 
27
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 25)
 
28
+#include <linux/semaphore.h>
 
29
+#endif
 
30
 
 
31
 #include "gpakenum.h"
 
32
 #include "adt_lec.h"
 
33
-- 
 
34
1.7.1
 
35