diff --git a/[refs] b/[refs]
index 22d87727cf8d..d8029eb3f30f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 846a798174d3376542a394a3c5227ef149445e83
+refs/heads/master: f4a18312f46a6c6e0ba7b81776b01fc36edea9fc
diff --git a/trunk/lib/devres.c b/trunk/lib/devres.c
index 9c76b3a9cc72..88ad75952a76 100644
--- a/trunk/lib/devres.c
+++ b/trunk/lib/devres.c
@@ -1,3 +1,4 @@
+#include <linux/err.h>
 #include <linux/pci.h>
 #include <linux/io.h>
 #include <linux/gfp.h>