Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into rmobile-latest

Conflicts:
	arch/arm/mach-shmobile/Makefile

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/arch/powerpc/sysdev/ppc4xx_cpm.c b/arch/powerpc/sysdev/ppc4xx_cpm.c
index 73b86cc5ea74..82e2cfe35c62 100644
--- 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