projects
/
platform
/
kernel
/
linux-amlogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a1f84f5
)
drm/nouveau/hwmon: fix compilation without CONFIG_HWMON
author
Ilia Mirkin
<imirkin@alum.mit.edu>
Wed, 27 Nov 2013 17:38:42 +0000
(12:38 -0500)
committer
Dave Airlie
<airlied@redhat.com>
Thu, 28 Nov 2013 04:38:09 +0000
(14:38 +1000)
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>
drivers/gpu/drm/nouveau/nouveau_hwmon.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/nouveau/nouveau_hwmon.c
b/drivers/gpu/drm/nouveau/nouveau_hwmon.c
index
38a4db5
..
4aff04f
100644
(file)
--- 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
}