diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-01-10 05:13:16 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-01-10 05:13:16 -0500 |
| commit | 095f979a539245a46b9e5d600ec9c720b4d928e5 (patch) | |
| tree | f8632cdddd2c041d751111511d05fedd136fc432 | |
| parent | 96067adf55bd93618cec4b6de08aebaad8203c9b (diff) | |
drm/nouveau/pm: fix build with HWMON off
Reported-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_pm.c | 2 |
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 = { | |||
| 663 | static int | 663 | static int |
| 664 | nouveau_hwmon_init(struct drm_device *dev) | 664 | nouveau_hwmon_init(struct drm_device *dev) |
| 665 | { | 665 | { |
| 666 | #if defined(CONFIG_HWMON) || (defined(MODULE) && defined(CONFIG_HWMON_MODULE)) | ||
| 667 | struct drm_nouveau_private *dev_priv = dev->dev_private; | 666 | struct drm_nouveau_private *dev_priv = dev->dev_private; |
| 668 | struct nouveau_pm_engine *pm = &dev_priv->engine.pm; | 667 | struct nouveau_pm_engine *pm = &dev_priv->engine.pm; |
| 668 | #if defined(CONFIG_HWMON) || (defined(MODULE) && defined(CONFIG_HWMON_MODULE)) | ||
| 669 | struct device *hwmon_dev; | 669 | struct device *hwmon_dev; |
| 670 | int ret = 0; | 670 | int ret = 0; |
| 671 | 671 | ||
