diff options
| author | Ben Widawsky <ben@bwidawsk.net> | 2012-09-19 10:50:19 -0700 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-09-20 14:23:11 +0200 |
| commit | 853c70e8dabcb1ae2c38ef2b8d40f6eb5435555b (patch) | |
| tree | 8fc62756e375244b167b3f39276c2fa165f3475f | |
| parent | 41783eea1a7f7d033ace4fd78218dd5f37b2db5f (diff) | |
drm/i915: Fix !CONFIG_PM sysfs for real this timedrm-intel-next-2012-09-20
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>
| -rw-r--r-- | drivers/gpu/drm/i915/i915_sysfs.c | 2 |
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 a2535151939..903eebd2117 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 } |