From: Ilia Mirkin <imirkin@alum.mit.edu>
Date: Wed, 27 Nov 2013 17:38:42 +0000 (-0500)
Subject: drm/nouveau/hwmon: fix compilation without CONFIG_HWMON
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=eec99016e38b740662509f097effb90abc7a1376;p=openwrt%2Fstaging%2Fblogic.git

drm/nouveau/hwmon: fix compilation without CONFIG_HWMON

Reported-by: Jim Davis <jim.epost@gmail.com>
Tested-by: Jim Davis <jim.epost@gmail.com>
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: Dave Airlie <airlied@redhat.com>
---

diff --git a/drivers/gpu/drm/nouveau/nouveau_hwmon.c b/drivers/gpu/drm/nouveau/nouveau_hwmon.c
index 38a4db5bfe21..4aff04fa483c 100644
--- a/drivers/gpu/drm/nouveau/nouveau_hwmon.c
+++ b/drivers/gpu/drm/nouveau/nouveau_hwmon.c
@@ -630,7 +630,6 @@ error:
 	hwmon->hwmon = NULL;
 	return ret;
 #else
-	hwmon->hwmon = NULL;
 	return 0;
 #endif
 }