From 3c614bd09bcfd4c0d632b46db785d66644bdbbe8 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 6 Aug 2010 03:13:47 +0100
Subject: [PATCH] --- yaml --- r: 206264 b: refs/heads/master c:
 af352fe960263fbab3252be0ba6d4e0a27e62f5d h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/net/dns_resolver/dns_key.c   | 1 +
 trunk/net/dns_resolver/dns_query.c | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d02303f8f5f7..2052ade272fa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 07567a5509327bcbf2c867286eb1524447c9b954
+refs/heads/master: af352fe960263fbab3252be0ba6d4e0a27e62f5d
diff --git a/trunk/net/dns_resolver/dns_key.c b/trunk/net/dns_resolver/dns_key.c
index 1b1b411adcf1..400a04d5c9a1 100644
--- a/trunk/net/dns_resolver/dns_key.c
+++ b/trunk/net/dns_resolver/dns_key.c
@@ -28,6 +28,7 @@
 #include <linux/string.h>
 #include <linux/kernel.h>
 #include <linux/keyctl.h>
+#include <linux/err.h>
 #include <keys/dns_resolver-type.h>
 #include <keys/user-type.h>
 #include "internal.h"
diff --git a/trunk/net/dns_resolver/dns_query.c b/trunk/net/dns_resolver/dns_query.c
index 6c0cf31ea00d..b33e1f7ff48d 100644
--- a/trunk/net/dns_resolver/dns_query.c
+++ b/trunk/net/dns_resolver/dns_query.c
@@ -39,6 +39,7 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/dns_resolver.h>
+#include <linux/err.h>
 #include <keys/dns_resolver-type.h>
 #include <keys/user-type.h>