---

yaml --- r: 329497 b: refs/heads/master c: 853c70e h: refs/heads/master i: 329495: edf1fe6 v: v3
git-mirror · Sep 20, 2012 · 5ad7ca9 · 5ad7ca9
1 parent b2b44c2
commit 5ad7ca9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 41783eea1a7f7d033ace4fd78218dd5f37b2db5f
+refs/heads/master: 853c70e8dabcb1ae2c38ef2b8d40f6eb5435555b
diff --git a/trunk/drivers/gpu/drm/i915/i915_sysfs.c b/trunk/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
 }