summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorDave Airlie2012-01-10 11:13:16 +0100
committerDave Airlie2012-01-10 11:13:16 +0100
commit095f979a539245a46b9e5d600ec9c720b4d928e5 (patch)
treef8632cdddd2c041d751111511d05fedd136fc432 /drivers/gpu
parentgma500: silence gcc warnings in mid_get_vbt_data() (diff)
downloadkernel-qcow2-linux-095f979a539245a46b9e5d600ec9c720b4d928e5.tar.gz
kernel-qcow2-linux-095f979a539245a46b9e5d600ec9c720b4d928e5.tar.xz
kernel-qcow2-linux-095f979a539245a46b9e5d600ec9c720b4d928e5.zip
drm/nouveau/pm: fix build with HWMON off
Reported-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_pm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_pm.c b/drivers/gpu/drm/nouveau/nouveau_pm.c
index aba3362d421a..9064d7f19794 100644
--- 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;