diff --git a/[refs] b/[refs]
index ee7d33ab7793..8b3ffc55f097 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 621769334b6a9be702e4f9e3c56a77da1a112377
+refs/heads/master: e15cb144939c84947b4fbcf191cda59d71cd0b34
diff --git a/trunk/drivers/thermal/user_space.c b/trunk/drivers/thermal/user_space.c
index fb246b90286e..6bbb380b6d19 100644
--- a/trunk/drivers/thermal/user_space.c
+++ b/trunk/drivers/thermal/user_space.c
@@ -35,7 +35,7 @@
  *
  * This function notifies the user space through UEvents.
  */
-int notify_user_space(struct thermal_zone_device *tz, int trip)
+static int notify_user_space(struct thermal_zone_device *tz, int trip)
 {
 	mutex_lock(&tz->lock);
 	kobject_uevent(&tz->device.kobj, KOBJ_CHANGE);
@@ -43,7 +43,7 @@ int notify_user_space(struct thermal_zone_device *tz, int trip)
 	return 0;
 }
 
-struct thermal_governor thermal_gov_user_space = {
+static struct thermal_governor thermal_gov_user_space = {
 	.name		= "user_space",
 	.throttle	= notify_user_space,
 	.owner		= THIS_MODULE,