From 10f98f2dd0b266b196b3d1f0e4cb6d345842a51e Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@stusta.de>
Date: Mon, 18 Jun 2007 01:42:54 +0200
Subject: [PATCH] --- yaml --- r: 59102 b: refs/heads/master c:
 2a0134554e12f530c6eccb1dab3f0f8954f855c9 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/base/base.h   | 2 +-
 trunk/drivers/base/devres.c | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c2954fedefef..1be931aff87c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab71c6f0767bcbc618f3db51f668d5b951c00b60
+refs/heads/master: 2a0134554e12f530c6eccb1dab3f0f8954f855c9
diff --git a/trunk/drivers/base/base.h b/trunk/drivers/base/base.h
index 5512d84452f2..47eb02d9f1af 100644
--- a/trunk/drivers/base/base.h
+++ b/trunk/drivers/base/base.h
@@ -44,6 +44,6 @@ struct class_device_attribute *to_class_dev_attr(struct attribute *_attr)
 
 extern char *make_class_name(const char *name, struct kobject *kobj);
 
-extern void devres_release_all(struct device *dev);
+extern int devres_release_all(struct device *dev);
 
 extern struct kset devices_subsys;
diff --git a/trunk/drivers/base/devres.c b/trunk/drivers/base/devres.c
index e1c0730a3b99..e8beb8e5b626 100644
--- a/trunk/drivers/base/devres.c
+++ b/trunk/drivers/base/devres.c
@@ -10,6 +10,8 @@
 #include <linux/device.h>
 #include <linux/module.h>
 
+#include "base.h"
+
 struct devres_node {
 	struct list_head		entry;
 	dr_release_t			release;