From 6a35e564707ce664c8eaa884bfcc836fb4e8e864 Mon Sep 17 00:00:00 2001
From: Francisco Jerez <currojerez@riseup.net>
Date: Thu, 23 Sep 2010 20:36:42 +0200
Subject: [PATCH] --- yaml --- r: 218226 b: refs/heads/master c:
 5c4abd09bdefb41d0c80055aa9d98433624ce1f0 h: refs/heads/master v: v3

---
 [refs]                                       |  2 +-
 trunk/drivers/gpu/drm/nouveau/nouveau_pm.c   | 10 ++++------
 trunk/drivers/gpu/drm/nouveau/nouveau_temp.c |  2 +-
 trunk/drivers/gpu/drm/nouveau/nv04_pm.c      |  1 +
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index e2a037195a9d..5fe00e2fe6d3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 66146da06643d8ee89bc5255fb0254006e3d0e79
+refs/heads/master: 5c4abd09bdefb41d0c80055aa9d98433624ce1f0
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_pm.c b/trunk/drivers/gpu/drm/nouveau/nouveau_pm.c
index 85a56dea0ef7..b1d3f4b26ebd 100644
--- a/trunk/drivers/gpu/drm/nouveau/nouveau_pm.c
+++ b/trunk/drivers/gpu/drm/nouveau/nouveau_pm.c
@@ -227,8 +227,8 @@ nouveau_pm_set_perflvl(struct device *d, struct device_attribute *a,
 	return strlen(buf);
 }
 
-DEVICE_ATTR(performance_level, S_IRUGO | S_IWUSR,
-	    nouveau_pm_get_perflvl, nouveau_pm_set_perflvl);
+static DEVICE_ATTR(performance_level, S_IRUGO | S_IWUSR,
+		   nouveau_pm_get_perflvl, nouveau_pm_set_perflvl);
 
 static int
 nouveau_sysfs_init(struct drm_device *dev)
@@ -283,8 +283,6 @@ nouveau_sysfs_fini(struct drm_device *dev)
 	}
 }
 
-
-
 static ssize_t
 nouveau_hwmon_show_temp(struct device *d, struct device_attribute *a, char *buf)
 {
@@ -317,7 +315,7 @@ nouveau_hwmon_set_max_temp(struct device *d, struct device_attribute *a,
 	struct nouveau_pm_threshold_temp *temp = &pm->threshold_temp;
 	long value;
 
-	if (strict_strtoul(buf, 10, &value) == -EINVAL)
+	if (strict_strtol(buf, 10, &value) == -EINVAL)
 		return count;
 
 	temp->down_clock = value/1000;
@@ -352,7 +350,7 @@ nouveau_hwmon_set_critical_temp(struct device *d, struct device_attribute *a,
 	struct nouveau_pm_threshold_temp *temp = &pm->threshold_temp;
 	long value;
 
-	if (strict_strtoul(buf, 10, &value) == -EINVAL)
+	if (strict_strtol(buf, 10, &value) == -EINVAL)
 		return count;
 
 	temp->critical = value/1000;
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_temp.c b/trunk/drivers/gpu/drm/nouveau/nouveau_temp.c
index f9eda87d1773..16bbbf1eff63 100644
--- a/trunk/drivers/gpu/drm/nouveau/nouveau_temp.c
+++ b/trunk/drivers/gpu/drm/nouveau/nouveau_temp.c
@@ -27,7 +27,7 @@
 #include "nouveau_drv.h"
 #include "nouveau_pm.h"
 
-void
+static void
 nouveau_temp_vbios_parse(struct drm_device *dev, u8 *temp)
 {
 	struct drm_nouveau_private *dev_priv = dev->dev_private;
diff --git a/trunk/drivers/gpu/drm/nouveau/nv04_pm.c b/trunk/drivers/gpu/drm/nouveau/nv04_pm.c
index 15e4b9029df8..61ca92744f93 100644
--- a/trunk/drivers/gpu/drm/nouveau/nv04_pm.c
+++ b/trunk/drivers/gpu/drm/nouveau/nv04_pm.c
@@ -25,6 +25,7 @@
 #include "drmP.h"
 #include "nouveau_drv.h"
 #include "nouveau_hw.h"
+#include "nouveau_pm.h"
 
 struct nv04_pm_state {
 	struct pll_lims pll;