From: Ben Widawsky <ben@bwidawsk.net> Date: Wed, 19 Sep 2012 17:50:19 +0000 (-0700) Subject: drm/i915: Fix !CONFIG_PM sysfs for real this time X-Git-Tag: firefly_0821_release~3680^2~1722^2~8^2~42 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=853c70e8dabcb1ae2c38ef2b8d40f6eb5435555b;p=firefly-linux-kernel-4.4.55.git drm/i915: Fix !CONFIG_PM sysfs for real this time Somehow this hunk got dropped from my last patch. We do not have the rc6_attrs when there is no CONFIG_PM so this causes a compilation error. Reported-by: Fengguang Wu <fengguang.wu@intel.com> Signed-off-by: Ben Widawsky <ben@bwidawsk.net> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> --- diff --git a/drivers/gpu/drm/i915/i915_sysfs.c b/drivers/gpu/drm/i915/i915_sysfs.c index a25351519397..903eebd2117a 100644 --- a/drivers/gpu/drm/i915/i915_sysfs.c +++ b/drivers/gpu/drm/i915/i915_sysfs.c @@ -410,5 +410,7 @@ void i915_teardown_sysfs(struct drm_device *dev) { sysfs_remove_files(&dev->primary->kdev.kobj, gen6_attrs); device_remove_bin_file(&dev->primary->kdev, &dpf_attrs); +#ifdef CONFIG_PM sysfs_unmerge_group(&dev->primary->kdev.kobj, &rc6_attr_group); +#endif }