From 9de893c5643ddfb100e2df824f002348d227ec88 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@stusta.de>
Date: Fri, 17 Nov 2006 02:19:44 +0100
Subject: [PATCH] --- yaml --- r: 41199 b: refs/heads/master c:
 af9e0765362151b27372c14d9d6dc417184182d3 h: refs/heads/master i:   41197:
 8f27ca71a8181c1a4dc9c57639ad5ae1970350aa   41195:
 7f4d04bd58766b129a50b02ef2f69faa38c93356   41191:
 6494252a1b4b96ebf45be64a294275fcc50061bf   41183:
 804ae7dcff61bbd84bb0b95b4ff2325a4d716cec v: v3

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

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;