diff --git a/[refs] b/[refs]
index 9bc9799ff3ac..965f15992e4e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5ab699810d46011ad2195c5916f3cbc684bfe3ee
+refs/heads/master: af9e0765362151b27372c14d9d6dc417184182d3
diff --git a/trunk/drivers/base/core.c b/trunk/drivers/base/core.c
index a29e68545462..75b45a10935a 100644
--- a/trunk/drivers/base/core.c
+++ b/trunk/drivers/base/core.c
@@ -389,7 +389,7 @@ void device_initialize(struct device *dev)
 }
 
 #ifdef CONFIG_SYSFS_DEPRECATED
-int setup_parent(struct device *dev, struct device *parent)
+static int setup_parent(struct device *dev, struct device *parent)
 {
 	/* Set the parent to the class, not the parent device */
 	/* this keeps sysfs from having a symlink to make old udevs happy */
@@ -418,7 +418,7 @@ static int virtual_device_parent(struct device *dev)
 	return 0;
 }
 
-int setup_parent(struct device *dev, struct device *parent)
+static int setup_parent(struct device *dev, struct device *parent)
 {
 	int error;