Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next

[mv-sheeva.git] / include / linux / selinux.h

diff --git a/include/linux/selinux.h b/include/linux/selinux.h
index 223d06a6feb116c968b84b40908bada3aa0af4e4..82e0f26a12996a1bcce6efddd07e734313162c19 100644 (file)
--- a/include/linux/selinux.h
+++ b/include/linux/selinux.h
@@ -89,7 +89,7 @@ static inline void selinux_secmark_refcount_dec(void)
        return;
 }
 
-static bool selinux_is_enabled(void)
+static inline bool selinux_is_enabled(void)
 {
        return false;
 }