| Message ID | 1348077019-5893-1-git-send-email-ben@bwidawsk.net (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Wed, Sep 19, 2012 at 10:50:19AM -0700, Ben Widawsky wrote: > 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> Queued for -next, thanks for the patch. -Daniel > --- > drivers/gpu/drm/i915/i915_sysfs.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/gpu/drm/i915/i915_sysfs.c b/drivers/gpu/drm/i915/i915_sysfs.c > index 4717a42..5f33a6b 100644 > --- a/drivers/gpu/drm/i915/i915_sysfs.c > +++ b/drivers/gpu/drm/i915/i915_sysfs.c > @@ -413,5 +413,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 > } > -- > 1.7.12 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/drivers/gpu/drm/i915/i915_sysfs.c b/drivers/gpu/drm/i915/i915_sysfs.c index 4717a42..5f33a6b 100644 --- a/drivers/gpu/drm/i915/i915_sysfs.c +++ b/drivers/gpu/drm/i915/i915_sysfs.c @@ -413,5 +413,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 }
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> --- drivers/gpu/drm/i915/i915_sysfs.c | 2 ++ 1 file changed, 2 insertions(+)