projects
/
platform
/
kernel
/
linux-3.10.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
96067ad
)
drm/nouveau/pm: fix build with HWMON off
author
Dave Airlie
<airlied@redhat.com>
Tue, 10 Jan 2012 10:13:16 +0000
(10:13 +0000)
committer
Dave Airlie
<airlied@redhat.com>
Tue, 10 Jan 2012 10:13:16 +0000
(10:13 +0000)
Reported-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/nouveau/nouveau_pm.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/nouveau/nouveau_pm.c
b/drivers/gpu/drm/nouveau/nouveau_pm.c
index
aba3362
..
9064d7f
100644
(file)
--- a/
drivers/gpu/drm/nouveau/nouveau_pm.c
+++ b/
drivers/gpu/drm/nouveau/nouveau_pm.c
@@
-663,9
+663,9
@@
static const struct attribute_group hwmon_pwm_fan_attrgroup = {
static int
nouveau_hwmon_init(struct drm_device *dev)
{
-#if defined(CONFIG_HWMON) || (defined(MODULE) && defined(CONFIG_HWMON_MODULE))
struct drm_nouveau_private *dev_priv = dev->dev_private;
struct nouveau_pm_engine *pm = &dev_priv->engine.pm;
+#if defined(CONFIG_HWMON) || (defined(MODULE) && defined(CONFIG_HWMON_MODULE))
struct device *hwmon_dev;
int ret = 0;