- asm/system.h is gone in linux 3.4

Changed files:
    dahdi-linux-kernel-3.4.patch -> 1.1
    dahdi-linux.spec -> 1.127

diff --git a/dahdi-linux-kernel-3.4.patch b/dahdi-linux-kernel-3.4.patch
new file mode 100644 (file)
index 0000000..dec3ef5
--- /dev/null
+++ b/dahdi-linux-kernel-3.4.patch
@@ -0,0 +1,23 @@
+--- dahdi-linux-2.6.0/drivers/dahdi/wcb4xxp/base.c.orig        2012-07-01 14:54:16.403757879 +0200
++++ dahdi-linux-2.6.0/drivers/dahdi/wcb4xxp/base.c     2012-07-01 14:57:24.020417929 +0200
+@@ -22,6 +22,7 @@
+ 
+ #include <linux/init.h>
+ 
++#include <linux/version.h>
+ #include <linux/kernel.h>     /* printk() */
+ #include <linux/errno.h>      /* error codes */
+ #include <linux/module.h>
+@@ -35,7 +36,11 @@
+ #include <linux/spinlock.h>
+ #include <linux/device.h>     /* dev_err() */
+ #include <linux/interrupt.h>
+-#include <asm/system.h>               /* cli(), *_flags */
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0)
++#include <asm/system.h>               /* *mb(), barrier() */
++#else
++#include <asm/barrier.h>      /* *mb(), barrier() */
++#endif
+ #include <asm/uaccess.h>      /* copy_*_user */
+ #include <linux/workqueue.h>  /* work_struct */
+ #include <linux/timer.h>      /* timer_struct */

diff --git a/dahdi-linux.spec b/dahdi-linux.spec
index 31942f88c8feb0b04a5d41d25b20b4a11d1e8060..921c472a36ceabcfb74564cf641f8db8fbd73786 100644 (file)
--- a/dahdi-linux.spec
+++ b/dahdi-linux.spec
@@ -57,6 +57,7 @@ Source7:      %{FIRMWARE_URL}/dahdi-fw-hx8-2.06.tar.gz
 Patch0:                %{pname}-build.patch
 # http://oss.axsentis.de/people/stkn/openzap/dahdi-2.4.0-linux-2.6.37.patch
 Patch1:                dahdi-2.4.0-linux-2.6.37.patch
+Patch2:                dahdi-linux-kernel-3.4.patch
 URL:           http://www.asterisk.org/
 %if %{with dist_kernel}
 BuildRequires: kernel%{_alt_kernel}-module-build
@@ -135,6 +136,7 @@ Sterownik dla jądra Linuksa do urządzeń telefonicznych DAHDI.
 %setup -q -n %{pname}-%{version}
 %patch0 -p1
 #%patch1 -p1
+%patch2 -p1
 
 for a in %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7}; do
        ln -s $a drivers/dahdi/firmware