From: Giovanni Maruzzelli <gmaruzz@gmail.com>
Date: Wed, 20 Jun 2012 09:28:28 +0000 (+0200)
Subject: FS-4278 skypopen: oss driver compiles on kernels >= 3.4.0
X-Git-Tag: v1.2.0~290^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a80b68367c3eedb0aa4d27b26a1dcf4a1ae5042a;p=thirdparty%2Ffreeswitch.git

FS-4278 skypopen: oss driver compiles on kernels >= 3.4.0
---

diff --git a/src/mod/endpoints/mod_skypopen/oss/main.c b/src/mod/endpoints/mod_skypopen/oss/main.c
index d92d2dc863..897978a2b7 100644
--- a/src/mod/endpoints/mod_skypopen/oss/main.c
+++ b/src/mod/endpoints/mod_skypopen/oss/main.c
@@ -29,7 +29,6 @@
 #include <linux/seq_file.h>
 #include <linux/cdev.h>
 
-#include <asm/system.h>		/* cli(), *_flags */
 #include <asm/uaccess.h>	/* copy_*_user */
 
 #include <linux/soundcard.h>
diff --git a/src/mod/endpoints/mod_skypopen/oss/skypopen.h b/src/mod/endpoints/mod_skypopen/oss/skypopen.h
index dca1f8870d..29e32feeca 100644
--- a/src/mod/endpoints/mod_skypopen/oss/skypopen.h
+++ b/src/mod/endpoints/mod_skypopen/oss/skypopen.h
@@ -21,6 +21,12 @@
 
 #include <linux/version.h>
 #include <linux/ioctl.h> /* needed for the _IOW etc stuff used later */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0)
+#include <asm/switch_to.h>		/* cli(), *_flags */
+#else
+#include <asm/system.h>		/* cli(), *_flags */
+#endif //LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0)
+
 
 #if LINUX_VERSION_CODE == KERNEL_VERSION(2, 6, 18)
 #define CENTOS_5