Fixed configure check for linux/mutex.h

diff --git a/configure.ac b/configure.ac
index 6870c14945ec400cf4f4a8e639b5e1abf090b8a7..0673d8ae0bc94aa369262281ee7a5f7919d82593 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -135,6 +135,9 @@ AC_ARG_ENABLE([kbuild], [  --enable-kbuild  Force use (or not) of kernel's Kbuild
        [ENABLE_KBUILD=$enableval], [])
 AM_CONDITIONAL([CONFIG_KBUILD], [test ${ENABLE_KBUILD} = "yes"])
 COMEDI_CHECK_HAVE_MUTEX_H([$LINUX_SRC_DIR], [HAVE_MUTEX_H="yes"], [HAVE_MUTEX_H="no"])
+if test ${HAVE_MUTEX_H} = "yes" ; then
+       AC_DEFINE([CONFIG_COMEDI_HAVE_MUTEX_H], [true], [Define if Linux kernel has mutex.h header])
+fi
 AS_LINUX_CONFIG_OPTION_MODULE(CONFIG_ISA)
 
 AC_DEFINE(CONFIG_COMEDI_DEBUG, true, [Define if debugging is enabled])

diff --git a/include/linux/mutex.h b/include/linux/mutex.h
index 90218156ab3ebd0d1d4cdad1b9511d51e678895e..ee3f9ac5f2339fe194e7bc03dcd687ea1285f19f 100644 (file)
--- a/include/linux/mutex.h
+++ b/include/linux/mutex.h
@@ -25,7 +25,9 @@
 #ifndef __COMPAT_LINUX_MUTEX_H_
 #define __COMPAT_LINUX_MUTEX_H_
 
-#ifdef HAVE_MUTEX_H
+#include <linux/config.h>
+
+#ifdef CONFIG_COMEDI_HAVE_MUTEX_H
 
 #include_next <linux/mutex.h>