Merge 3.13-rc5 into staging-next

[~andy/linux] / arch / powerpc / sysdev / ppc4xx_cpm.c

diff --git a/arch/powerpc/sysdev/ppc4xx_cpm.c b/arch/powerpc/sysdev/ppc4xx_cpm.c
index 73b86cc5ea747025ee66dcfdfd69e8f170bc693b..82e2cfe35c62d4061c9a4bf94d40ce5e6313f150 100644 (file)
--- a/arch/powerpc/sysdev/ppc4xx_cpm.c
+++ b/arch/powerpc/sysdev/ppc4xx_cpm.c
@@ -179,12 +179,12 @@ static struct kobj_attribute cpm_idle_attr =
 
 static void cpm_idle_config_sysfs(void)
 {
-       struct sys_device *sys_dev;
+       struct device *dev;
        unsigned long ret;
 
-       sys_dev = get_cpu_sysdev(0);
+       dev = get_cpu_device(0);
 
-       ret = sysfs_create_file(&sys_dev->kobj,
+       ret = sysfs_create_file(&dev->kobj,
                                &cpm_idle_attr.attr);
        if (ret)
                printk(KERN_WARNING