From: Ulf Hansson Date: Thu, 2 Oct 2014 19:12:34 +0000 (+0200) Subject: PM / Domains: Rename cpu_data to cpuidle_data X-Git-Tag: fixes-against-v3.18-rc2~138^2~5^2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f39cb1797ec1094b196d3dab44a7ca6060813d38;p=pandora-kernel.git PM / Domains: Rename cpu_data to cpuidle_data The "cpu_data" are defined for some archs and thus conflicting with the "cpu_data" member in the struct gpd_cpu_data. This causes a compiler error for those archs. Let's fix it by rename the member to cpuidle_data. In this context it also seems appropriate to rename the struct to gpd_cpuidle_data to better reflect its use. Fixes: f48c767ce895 (PM / Domains: Move dev_pm_domain_attach|detach() to pm_domain.h) Signed-off-by: Ulf Hansson Acked-by: Geert Uytterhoeven Acked-by: Pavel Machek Signed-off-by: Rafael J. Wysocki --- Reading git-diff-tree failed