]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
drm/i915: make rc6 in sysfs functions conditional
authorHunt Xu <mhuntxu@gmail.com>
Sun, 1 Jul 2012 03:45:07 +0000 (03:45 +0000)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 6 Aug 2012 17:31:33 +0000 (19:31 +0200)
commit5ab3633d6907018b0b830a720e877c3884d679c3
tree0130174f69dde88a67d6e17dee36fff02d96c2f1
parentbcf9dcc1e6269fac674e41f25d007ff75f76e840
drm/i915: make rc6 in sysfs functions conditional

Commit 0136db586c028f71e7cc21cc183064ff0d5919c8 merges rc6 information
into the power group. However, when compiled with CONFIG_PM not set,
modprobing i915 would taint since power_group_name is defined as NULL.

This patch makes these rc6 in sysfs functions conditional upon the
definition of the CONFIG_PM macro to avoid the above-mentioned problem.

Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=45181
Cc: stable@vger.kernel.org
Tested-by: Kris Karas <bugs-a12@moonlit-rail.com>
Signed-off-by: Hunt Xu <mhuntxu@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/i915_sysfs.c