From: Dave Airlie Date: Tue, 10 Jan 2012 10:13:16 +0000 (+0000) Subject: drm/nouveau/pm: fix build with HWMON off X-Git-Tag: v3.3-rc1~121^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=095f979a539245a46b9e5d600ec9c720b4d928e5;p=platform%2Fupstream%2Fkernel-adaptation-pc.git drm/nouveau/pm: fix build with HWMON off Reported-by: Randy Dunlap Signed-off-by: Dave Airlie --- diff --git a/drivers/gpu/drm/nouveau/nouveau_pm.c b/drivers/gpu/drm/nouveau/nouveau_pm.c index aba3362..9064d7f 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;