drm/i915: Fix !CONFIG_PM sysfs for real this time
authorBen Widawsky <ben@bwidawsk.net>
Wed, 19 Sep 2012 17:50:19 +0000 (10:50 -0700)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Thu, 20 Sep 2012 12:23:11 +0000 (14:23 +0200)
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>
drivers/gpu/drm/i915/i915_sysfs.c

index a2535151939704856f3bc0193f4d7e3b1819a918..903eebd2117a41437837131adb46811ce858fbdd 100644 (file)
@@ -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
 }