]> git.karo-electronics.de Git - karo-tx-linux.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)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 26 Aug 2012 02:31:40 +0000 (19:31 -0700)
commit4267ea6bdb984ecda4aa042136e167944a397934
treebff68ee68fb0d64f3fdb1f58c86564d677be8aeb
parent375849ce878f1a2dfac12ea2a62b361ab6b7f9a5
drm/i915: make rc6 in sysfs functions conditional

commit 5ab3633d6907018b0b830a720e877c3884d679c3 upstream.

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
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/gpu/drm/i915/i915_sysfs.c