From f0dd93afda22d570a68cc4c9ca0bf6edd2577c1b Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Tue, 10 Jan 2012 10:13:16 +0000 Subject: [PATCH] --- yaml --- r: 282746 b: refs/heads/master c: 095f979a539245a46b9e5d600ec9c720b4d928e5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_pm.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c1e9dbb84194..f6df68293ade 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 96067adf55bd93618cec4b6de08aebaad8203c9b +refs/heads/master: 095f979a539245a46b9e5d600ec9c720b4d928e5 diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_pm.c b/trunk/drivers/gpu/drm/nouveau/nouveau_pm.c index aba3362d421a..9064d7f19794 100644 --- a/trunk/drivers/gpu/drm/nouveau/nouveau_pm.c +++ b/trunk/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;