From fb244e014255ddcb16208bd7786a3bf8e96a950d Mon Sep 17 00:00:00 2001
From: Mimi Zohar <zohar@linux.vnet.ibm.com>
Date: Mon, 29 Nov 2010 16:20:04 -0500
Subject: [PATCH] --- yaml --- r: 227790 b: refs/heads/master c:
 93ae86e759299718c611bc543b9b1633bf32905a h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/security/keys/encrypted_defined.c | 1 +
 trunk/security/keys/trusted_defined.c   | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 412a7a98e998..cbe429880834 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b4e0d5f0791bd6dd12a1c1edea0340969c7c1f90
+refs/heads/master: 93ae86e759299718c611bc543b9b1633bf32905a
diff --git a/trunk/security/keys/encrypted_defined.c b/trunk/security/keys/encrypted_defined.c
index 0e558dcad92f..3f4085703e6c 100644
--- a/trunk/security/keys/encrypted_defined.c
+++ b/trunk/security/keys/encrypted_defined.c
@@ -17,6 +17,7 @@
 #include <linux/slab.h>
 #include <linux/parser.h>
 #include <linux/string.h>
+#include <linux/err.h>
 #include <keys/user-type.h>
 #include <keys/trusted-type.h>
 #include <keys/encrypted-type.h>
diff --git a/trunk/security/keys/trusted_defined.c b/trunk/security/keys/trusted_defined.c
index 1bec72e7596d..aaaa069967a6 100644
--- a/trunk/security/keys/trusted_defined.c
+++ b/trunk/security/keys/trusted_defined.c
@@ -17,6 +17,7 @@
 #include <linux/slab.h>
 #include <linux/parser.h>
 #include <linux/string.h>
+#include <linux/err.h>
 #include <keys/user-type.h>
 #include <keys/trusted-type.h>
 #include <linux/key-type.h>