diff options
| author | Ilia Mirkin <imirkin@alum.mit.edu> | 2013-11-27 12:38:42 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-11-28 14:38:09 +1000 |
| commit | eec99016e38b740662509f097effb90abc7a1376 (patch) | |
| tree | db99fe3118b7eb62dd475b7b78fadbb1697b3820 | |
| parent | a1f84f57f9f7a5060f17482fc26b39174ecb7a28 (diff) | |
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>
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_hwmon.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_hwmon.c b/drivers/gpu/drm/nouveau/nouveau_hwmon.c index 38a4db5bfe2..4aff04fa483 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 } |