diff options
author | Guenter Roeck <linux@roeck-us.net> | 2013-01-01 06:28:00 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2013-01-04 01:03:33 -0500 |
commit | 57cdf82ce578959ec871899ad4461475148009e0 (patch) | |
tree | 57f5bb9f4b8c8d32714df1f5d0aba21bd68181b2 | |
parent | e61e512b5ae7ceda32e84c5ccfe77b6188a01fad (diff) |
drm: nouveau: Fix build warning seen if HWMON is undefined
Fix:
nouveau_pm.c: In function ‘nouveau_hwmon_init’:
nouveau_pm.c:703:24: warning: unused variable ‘therm’ [-Wunused-variable]
Introduced by commit 095f979a (drm/nouveau/pm: fix build with HWMON off) which
fixed a build error but introduced a build warning.
Cc: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_pm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_pm.c b/drivers/gpu/drm/nouveau/nouveau_pm.c index 5566172774df..a701ff5ffa5b 100644 --- a/drivers/gpu/drm/nouveau/nouveau_pm.c +++ b/drivers/gpu/drm/nouveau/nouveau_pm.c | |||
@@ -698,10 +698,10 @@ static int | |||
698 | nouveau_hwmon_init(struct drm_device *dev) | 698 | nouveau_hwmon_init(struct drm_device *dev) |
699 | { | 699 | { |
700 | struct nouveau_pm *pm = nouveau_pm(dev); | 700 | struct nouveau_pm *pm = nouveau_pm(dev); |
701 | struct nouveau_drm *drm = nouveau_drm(dev); | ||
702 | struct nouveau_therm *therm = nouveau_therm(drm->device); | ||
703 | 701 | ||
704 | #if defined(CONFIG_HWMON) || (defined(MODULE) && defined(CONFIG_HWMON_MODULE)) | 702 | #if defined(CONFIG_HWMON) || (defined(MODULE) && defined(CONFIG_HWMON_MODULE)) |
703 | struct nouveau_drm *drm = nouveau_drm(dev); | ||
704 | struct nouveau_therm *therm = nouveau_therm(drm->device); | ||
705 | struct device *hwmon_dev; | 705 | struct device *hwmon_dev; |
706 | int ret = 0; | 706 | int ret = 0; |
707 | 707 | ||