From e5da409c26011d2c0d98eefbdcb46570a0f47506 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 15 Sep 2011 17:07:15 +1000
Subject: [PATCH] --- yaml --- r: 264547 b: refs/heads/master c:
 cc100551b4d92f47abebfa7c7918b2be71263b4a h: refs/heads/master i:   264545:
 2c202474809b57cdd170ac5164401aca80306941   264543:
 8a5b7b2e6b6cbf0cee33e2b021a58dadcc266ccf v: v3

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

diff --git a/[refs] b/[refs]
index 4d0c5f5f25ad..98cf13ccd8c6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8de6ac7f58a22fdab399fbe97763e465ea49c735
+refs/heads/master: cc100551b4d92f47abebfa7c7918b2be71263b4a
diff --git a/trunk/security/keys/encrypted-keys/masterkey_trusted.c b/trunk/security/keys/encrypted-keys/masterkey_trusted.c
index a5da5128891b..df87272e3f51 100644
--- a/trunk/security/keys/encrypted-keys/masterkey_trusted.c
+++ b/trunk/security/keys/encrypted-keys/masterkey_trusted.c
@@ -16,6 +16,7 @@
 
 #include <linux/uaccess.h>
 #include <linux/module.h>
+#include <linux/err.h>
 #include <keys/trusted-type.h>
 
 /*