main/dahdi-linux-vserver: fix build error

2 files changed, 18 insertions, 6 deletions

diff --git a/main/dahdi-linux-vserver/APKBUILD b/main/dahdi-linux-vserver/APKBUILD
index 6e52ce9ff8..7b5cb6d000 100644
--- a/main/dahdi-linux-vserver/APKBUILD
+++ b/main/dahdi-linux-vserver/APKBUILD
@@ -31,9 +31,11 @@ subpackages="$pkgname-dev"
 source="http://downloads.digium.com/pub/telephony/dahdi-linux/releases/${_realname}-$_dahdiver.tar.gz
         dahdi-depmod.patch
         dahdi-bri_dchan.patch
+        dahdi-2.5.0-bri-fixes.patch
         dahdi-zaphfc.patch
         zaphfc-dahdi-flortz.diff
         zaphfc-dahdi-2.4.0.patch
+        zaphfc-dahdi-2.5.0.patch
         "
 
 prepare() {
@@ -77,6 +79,8 @@ dev() {
 md5sums="449f6591ccedb68937b5b30cbd37cea3  dahdi-linux-2.5.0.tar.gz
 c78fb8d80f9efdffd950297c88ff9273  dahdi-depmod.patch
 3bb419ac598534cd4ad5248f23656001  dahdi-bri_dchan.patch
+9088ee5cd24f94b7f90c24e5ed6071e0  dahdi-2.5.0-bri-fixes.patch
 a822c092f0548cd13f5e8d8cba053af6  dahdi-zaphfc.patch
 291c5c44c86ab02443a742415461ddca  zaphfc-dahdi-flortz.diff
-0fdcd8c8c93bc1fe33c0af12b6cc6b05  zaphfc-dahdi-2.4.0.patch"
+0fdcd8c8c93bc1fe33c0af12b6cc6b05  zaphfc-dahdi-2.4.0.patch
+fc49cf22258d63487a83560385c3f6fa  zaphfc-dahdi-2.5.0.patch"
diff --git a/main/dahdi-linux-vserver/zaphfc-dahdi-2.5.0.patch b/main/dahdi-linux-vserver/zaphfc-dahdi-2.5.0.patch
index 37a1e76ba8..883a634847 100644
--- a/main/dahdi-linux-vserver/zaphfc-dahdi-2.5.0.patch
+++ b/main/dahdi-linux-vserver/zaphfc-dahdi-2.5.0.patch
@@ -1,8 +1,16 @@
 Index: dahdi-linux-2.5.0/drivers/dahdi/zaphfc.c
 ===================================================================
---- dahdi-linux-2.5.0.orig/drivers/dahdi/zaphfc.c       2011-08-15 14:29:51.000000000 +0300
-+++ dahdi-linux-2.5.0/drivers/dahdi/zaphfc.c    2011-08-15 14:30:11.000000000 +0300
-@@ -616,7 +616,7 @@
+--- dahdi-linux-2.5.0.orig/drivers/dahdi/zaphfc.c       2011-08-15 15:49:47.000000000 +0300
++++ dahdi-linux-2.5.0/drivers/dahdi/zaphfc.c    2011-08-15 15:50:07.000000000 +0300
+@@ -26,6 +26,7 @@
+ #include <linux/init.h>
+ #include <linux/interrupt.h>
+ #include <linux/delay.h>
++#include <linux/sched.h>
+ #include <dahdi/kernel.h>
+ #include "zaphfc.h"
+ 
+@@ -616,7 +617,7 @@
          return 0;
  }
  
@@ -11,7 +19,7 @@ Index: dahdi-linux-2.5.0/drivers/dahdi/zaphfc.c
      struct dahdi_hfc *zthfc = container_of(span, struct dahdi_hfc, span);
      struct hfc_card *hfctmp = zthfc->card;
      int alreadyrunning;
-@@ -653,12 +653,12 @@
+@@ -653,12 +654,12 @@
      return 0;
  }
  
@@ -26,7 +34,7 @@ Index: dahdi-linux-2.5.0/drivers/dahdi/zaphfc.c
      span->lineconfig = lc->lineconfig;
      return 0;
  }
-@@ -699,7 +699,6 @@
+@@ -699,7 +700,6 @@
      zthfc->span.deflaw = DAHDI_LAW_ALAW;
      zthfc->span.linecompat = DAHDI_CONFIG_AMI | DAHDI_CONFIG_CCS; // <--- this is really BS
      zthfc->span.offset = 0;