diff options
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/kernel/vio.c | 4 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/power.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c index 9eaefac5053f..b2c1b67a10a7 100644 --- a/arch/powerpc/kernel/vio.c +++ b/arch/powerpc/kernel/vio.c | |||
@@ -37,7 +37,7 @@ | |||
37 | #include <asm/iseries/hv_call_xm.h> | 37 | #include <asm/iseries/hv_call_xm.h> |
38 | #include <asm/iseries/iommu.h> | 38 | #include <asm/iseries/iommu.h> |
39 | 39 | ||
40 | extern struct subsystem devices_subsys; /* needed for vio_find_name() */ | 40 | extern struct kset devices_subsys; /* needed for vio_find_name() */ |
41 | 41 | ||
42 | static struct vio_dev vio_bus_device = { /* fake "parent" device */ | 42 | static struct vio_dev vio_bus_device = { /* fake "parent" device */ |
43 | .name = vio_bus_device.dev.bus_id, | 43 | .name = vio_bus_device.dev.bus_id, |
@@ -427,7 +427,7 @@ static struct vio_dev *vio_find_name(const char *kobj_name) | |||
427 | { | 427 | { |
428 | struct kobject *found; | 428 | struct kobject *found; |
429 | 429 | ||
430 | found = kset_find_obj(&devices_subsys.kset, kobj_name); | 430 | found = kset_find_obj(&devices_subsys, kobj_name); |
431 | if (!found) | 431 | if (!found) |
432 | return NULL; | 432 | return NULL; |
433 | 433 | ||
diff --git a/arch/powerpc/platforms/pseries/power.c b/arch/powerpc/platforms/pseries/power.c index 2624b71df73d..73e69023d90a 100644 --- a/arch/powerpc/platforms/pseries/power.c +++ b/arch/powerpc/platforms/pseries/power.c | |||
@@ -28,13 +28,13 @@ | |||
28 | 28 | ||
29 | unsigned long rtas_poweron_auto; /* default and normal state is 0 */ | 29 | unsigned long rtas_poweron_auto; /* default and normal state is 0 */ |
30 | 30 | ||
31 | static ssize_t auto_poweron_show(struct subsystem *subsys, char *buf) | 31 | static ssize_t auto_poweron_show(struct kset *kset, char *buf) |
32 | { | 32 | { |
33 | return sprintf(buf, "%lu\n", rtas_poweron_auto); | 33 | return sprintf(buf, "%lu\n", rtas_poweron_auto); |
34 | } | 34 | } |
35 | 35 | ||
36 | static ssize_t | 36 | static ssize_t |
37 | auto_poweron_store(struct subsystem *subsys, const char *buf, size_t n) | 37 | auto_poweron_store(struct kset *kset, const char *buf, size_t n) |
38 | { | 38 | { |
39 | int ret; | 39 | int ret; |
40 | unsigned long ups_restart; | 40 | unsigned long ups_restart; |
@@ -72,12 +72,12 @@ static int __init pm_init(void) | |||
72 | { | 72 | { |
73 | int error = subsystem_register(&power_subsys); | 73 | int error = subsystem_register(&power_subsys); |
74 | if (!error) | 74 | if (!error) |
75 | error = sysfs_create_group(&power_subsys.kset.kobj,&attr_group); | 75 | error = sysfs_create_group(&power_subsys.kobj, &attr_group); |
76 | return error; | 76 | return error; |
77 | } | 77 | } |
78 | core_initcall(pm_init); | 78 | core_initcall(pm_init); |
79 | #else | 79 | #else |
80 | extern struct subsystem power_subsys; | 80 | extern struct kset power_subsys; |
81 | 81 | ||
82 | static int __init apo_pm_init(void) | 82 | static int __init apo_pm_init(void) |
83 | { | 83 | { |