- fix build on 2.6.34

Changed files:
    dahdi-linux-build.patch -> 1.1
    dahdi-linux.spec -> 1.38

diff --git a/dahdi-linux-build.patch b/dahdi-linux-build.patch
new file mode 100644 (file)
index 0000000..6cd8155
--- /dev/null
+++ b/dahdi-linux-build.patch
@@ -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)

diff --git a/dahdi-linux.spec b/dahdi-linux.spec
index 8c38ab3926844db790d6f92aec8f9431d06e01c0..eee364731cc7a8118b117a7ca82a302eaa002345 100644 (file)
--- a/dahdi-linux.spec
+++ b/dahdi-linux.spec
@@ -55,6 +55,7 @@ Source6:      %{FIRMWARE_URL}/dahdi-fw-tc400m-MR6.12.tar.gz
 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
@@ -132,6 +133,7 @@ Sterownik dla jądra Linuksa do urządzeń telefonicznych DAHDI.
 %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