summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_sysfs.c
diff options
context:
space:
mode:
authorBen Widawsky <ben@bwidawsk.net>2012-09-19 19:50:19 +0200
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-09-20 14:23:11 +0200
commit853c70e8dabcb1ae2c38ef2b8d40f6eb5435555b (patch)
tree8fc62756e375244b167b3f39276c2fa165f3475f /drivers/gpu/drm/i915/i915_sysfs.c
parentdrm/i915: Assert that the exec object lookup table is a power-of-two (diff)
downloadlinux-853c70e8dabcb1ae2c38ef2b8d40f6eb5435555b.tar.xz
linux-853c70e8dabcb1ae2c38ef2b8d40f6eb5435555b.zip
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>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_sysfs.c')
-rw-r--r--drivers/gpu/drm/i915/i915_sysfs.c2
1 files changed, 2 insertions, 0 deletions
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
}