diff --git a/[refs] b/[refs]
index 2cab16a4cfed..9ca142602ee4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d4131ded4d4c1a5c1363ddd93ca104ed97dd0458
+refs/heads/master: 65c3f0a2d0f72d210c879e4974c2d222b7951321
diff --git a/trunk/include/linux/lsm_audit.h b/trunk/include/linux/lsm_audit.h
index 40d1b84f2a3c..a5514a3a4f17 100644
--- a/trunk/include/linux/lsm_audit.h
+++ b/trunk/include/linux/lsm_audit.h
@@ -68,6 +68,7 @@ struct common_audit_data {
 	} u;
 	/* this union contains LSM specific data */
 	union {
+#ifdef CONFIG_SECURITY_SMACK
 		/* SMACK data */
 		struct smack_audit_data {
 			const char *function;
@@ -76,6 +77,8 @@ struct common_audit_data {
 			char *request;
 			int result;
 		} smack_audit_data;
+#endif
+#ifdef CONFIG_SECURITY_SELINUX
 		/* SELinux data */
 		struct {
 			u32 ssid;
@@ -86,6 +89,7 @@ struct common_audit_data {
 			struct av_decision *avd;
 			int result;
 		} selinux_audit_data;
+#endif
 	};
 	/* these callback will be implemented by a specific LSM */
 	void (*lsm_pre_audit)(struct audit_buffer *, void *);