From 5ad7ca9fb39e7b4061b72c051a63f44f48bfe912 Mon Sep 17 00:00:00 2001
From: Ben Widawsky <ben@bwidawsk.net>
Date: Wed, 19 Sep 2012 10:50:19 -0700
Subject: [PATCH] --- yaml --- r: 329497 b: refs/heads/master c:
 853c70e8dabcb1ae2c38ef2b8d40f6eb5435555b h: refs/heads/master i:   329495:
 edf1fe62a375cd3de4c0843194807ad6fae4e254 v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/gpu/drm/i915/i915_sysfs.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b41bba3495bb..1aff4f6b455c 100644
--- 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
index a25351519397..903eebd2117a 100644
--- 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
 }