Author: arekm Date: Mon Aug 9 10:07:31 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- fix build on 2.6.34
---- Files affected:
packages/dahdi-linux:
dahdi-linux.spec (1.37 -> 1.38) , dahdi-linux-build.patch (NONE -> 1.1)
(NEW)
---- Diffs:
================================================================
Index: packages/dahdi-linux/dahdi-linux.spec
diff -u packages/dahdi-linux/dahdi-linux.spec:1.37
packages/dahdi-linux/dahdi-linux.spec:1.38
--- packages/dahdi-linux/dahdi-linux.spec:1.37 Mon Aug 9 11:38:40 2010
+++ packages/dahdi-linux/dahdi-linux.spec Mon Aug 9 12:07:26 2010
@@ -56,6 +56,7 @@
Source7: %{FIRMWARE_URL}/dahdi-fw-hx8-2.06.tar.gz
# Source7-md5: a7f3886942bb3e9fed349a41b3390c9f
Patch0: %{pname}-dummy.patch
+Patch1: %{pname}-build.patch
URL: http://www.asterisk.org/
%if %{with dist_kernel}
BuildRequires: kernel%{_alt_kernel}-module-build
@@ -133,6 +134,7 @@
%prep
%setup -q -n %{pname}-%{version}
%patch0 -p1
+%patch1 -p1
for a in %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7}; do
ln -s $a drivers/dahdi/firmware
@@ -217,6 +219,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.38 2010/08/09 10:07:26 arekm
+- fix build on 2.6.34
+
Revision 1.37 2010/08/09 09:38:40 zbyniu
- up to 2.3.0.1; standard kernel/dist_kernel bconds
================================================================
Index: packages/dahdi-linux/dahdi-linux-build.patch
diff -u /dev/null packages/dahdi-linux/dahdi-linux-build.patch:1.1
--- /dev/null Mon Aug 9 12:07:31 2010
+++ packages/dahdi-linux/dahdi-linux-build.patch Mon Aug 9 12:07:26 2010
@@ -0,0 +1,30 @@
+--- dahdi-linux-2.3.0/drivers/dahdi/dahdi_echocan_jpah.c 2010-04-14
20:07:50.667124592 +0000
++++ dahdi-linux-2.3.0/drivers/dahdi/dahdi_echocan_jpah.c 2010-04-14
20:08:05.434124321 +0000
+@@ -32,6 +32,7 @@
+ #include <linux/init.h>
+ #include <linux/ctype.h>
+ #include <linux/moduleparam.h>
++#include <linux/slab.h>
+
+ #include <dahdi/kernel.h>
+
+--- dahdi-linux-2.3.0/drivers/dahdi/dahdi_echocan_oslec.c 2010-04-14
20:07:50.667124592 +0000
++++ dahdi-linux-2.3.0/drivers/dahdi/dahdi_echocan_oslec.c 2010-04-14
20:08:05.434124321 +0000
+@@ -32,6 +32,7 @@
+ #include <linux/init.h>
+ #include <linux/ctype.h>
+ #include <linux/moduleparam.h>
++#include <linux/slab.h>
+
+ #include <dahdi/kernel.h>
+
+--- dahdi-linux-2.3.0.1/drivers/dahdi/dahdi_dummy.c~ 2009-08-05
21:39:13.000000000 +0200
++++ dahdi-linux-2.3.0.1/drivers/dahdi/dahdi_dummy.c 2010-08-09
12:04:24.965332226 +0200
+@@ -48,6 +48,7 @@
+ #include <linux/module.h>
+ #include <linux/init.h>
+ #include <linux/errno.h>
++#include <linux/slab.h>
+ #include <linux/moduleparam.h>
+
+ #if defined(USE_HIGHRESTIMER)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dahdi-linux/dahdi-linux.spec?r1=1.37&r2=1.38&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
