Re: [PATCH] drm/nouveau/hwmon: fix compilation without CONFIG_HWMON

2013/11/27 Ilia Mirkin imirkin@alum.mit.edu:

Reported-by: Jim Davis jim.epost@gmail.com Signed-off-by: Ilia Mirkin imirkin@alum.mit.edu

---

drivers/gpu/drm/nouveau/nouveau_hwmon.c | 1 - 1 file changed, 1 deletion(-)

diff --git a/drivers/gpu/drm/nouveau/nouveau_hwmon.c b/drivers/gpu/drm/nouveau/nouveau_hwmon.c index 38a4db5..4aff04f 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 }

I reran a configuration that had failed with that error with today's linux-next, and with the change it worked just fine. Tested-by: jim.epost@gmail.com

Jim