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 d92d2dc863d6533455651aaa748c775f4777efac..897978a2b705c6ade3d9ca8b729e9c4c6d5eb98c 100644 (file)
--- 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 dca1f8870d4149af01869b7c11ccb0c7c0f68761..29e32feecadd8884b44d88de2cb2a790f5077664 100644 (file)
--- 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