3 files changed, 9 insertions, 10 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
diff --git a/arch/powerpc/sysdev/qe_lib/qe_ic.c b/arch/powerpc/sysdev/qe_lib/qe_ic.c
index 18e75ca19fe6..73034bd203c4 100644
--- a/arch/powerpc/sysdev/qe_lib/qe_ic.c
+++ b/arch/powerpc/sysdev/qe_lib/qe_ic.c
@@ -22,7 +22,6 @@
 #include <linux/stddef.h>
 #include <linux/sched.h>
 #include <linux/signal.h>
-#include <linux/sysdev.h>
 #include <linux/device.h>
 #include <linux/bootmem.h>
 #include <linux/spinlock.h>
@@ -484,13 +483,14 @@ int qe_ic_set_high_priority(unsigned int virq, unsigned int priority, int high)
         return 0;
 }
 
-static struct sysdev_class qe_ic_sysclass = {
+static struct bus_type qe_ic_subsys = {
         .name = "qe_ic",
+        .dev_name = "qe_ic",
 };
 
-static struct sys_device device_qe_ic = {
+static struct device device_qe_ic = {
         .id = 0,
-        .cls = &qe_ic_sysclass,
+        .bus = &qe_ic_subsys,
 };
 
 static int __init init_qe_ic_sysfs(void)
@@ -499,12 +499,12 @@ static int __init init_qe_ic_sysfs(void)
 
         printk(KERN_DEBUG "Registering qe_ic with sysfs...\n");
 
-        rc = sysdev_class_register(&qe_ic_sysclass);
+        rc = subsys_system_register(&qe_ic_subsys, NULL);
         if (rc) {
                 printk(KERN_ERR "Failed registering qe_ic sys class\n");
                 return -ENODEV;
         }
-        rc = sysdev_register(&device_qe_ic);
+        rc = device_register(&device_qe_ic);
         if (rc) {
                 printk(KERN_ERR "Failed registering qe_ic sys device\n");
                 return -ENODEV;
diff --git a/arch/powerpc/sysdev/uic.c b/arch/powerpc/sysdev/uic.c
index 3330feca7502..063c901b1265 100644
--- a/arch/powerpc/sysdev/uic.c
+++ b/arch/powerpc/sysdev/uic.c
@@ -18,7 +18,6 @@
 #include <linux/stddef.h>
 #include <linux/sched.h>
 #include <linux/signal.h>
-#include <linux/sysdev.h>
 #include <linux/device.h>
 #include <linux/bootmem.h>
 #include <linux/spinlock.h>