diff options
Diffstat (limited to 'drivers/pci/hotplug')
-rw-r--r-- | drivers/pci/hotplug/acpiphp_ibm.c | 4 | ||||
-rw-r--r-- | drivers/pci/hotplug/pci_hotplug_core.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c index 7f03881a8b68..e7322c25d377 100644 --- a/drivers/pci/hotplug/acpiphp_ibm.c +++ b/drivers/pci/hotplug/acpiphp_ibm.c | |||
@@ -424,7 +424,7 @@ static int __init ibm_acpiphp_init(void) | |||
424 | int retval = 0; | 424 | int retval = 0; |
425 | acpi_status status; | 425 | acpi_status status; |
426 | struct acpi_device *device; | 426 | struct acpi_device *device; |
427 | struct kobject *sysdir = &pci_hotplug_slots_subsys.kset.kobj; | 427 | struct kobject *sysdir = &pci_hotplug_slots_subsys.kobj; |
428 | 428 | ||
429 | dbg("%s\n", __FUNCTION__); | 429 | dbg("%s\n", __FUNCTION__); |
430 | 430 | ||
@@ -471,7 +471,7 @@ init_return: | |||
471 | static void __exit ibm_acpiphp_exit(void) | 471 | static void __exit ibm_acpiphp_exit(void) |
472 | { | 472 | { |
473 | acpi_status status; | 473 | acpi_status status; |
474 | struct kobject *sysdir = &pci_hotplug_slots_subsys.kset.kobj; | 474 | struct kobject *sysdir = &pci_hotplug_slots_subsys.kobj; |
475 | 475 | ||
476 | dbg("%s\n", __FUNCTION__); | 476 | dbg("%s\n", __FUNCTION__); |
477 | 477 | ||
diff --git a/drivers/pci/hotplug/pci_hotplug_core.c b/drivers/pci/hotplug/pci_hotplug_core.c index f5d632e72323..63f3bd1eecc4 100644 --- a/drivers/pci/hotplug/pci_hotplug_core.c +++ b/drivers/pci/hotplug/pci_hotplug_core.c | |||
@@ -62,7 +62,7 @@ static int debug; | |||
62 | 62 | ||
63 | static LIST_HEAD(pci_hotplug_slot_list); | 63 | static LIST_HEAD(pci_hotplug_slot_list); |
64 | 64 | ||
65 | struct subsystem pci_hotplug_slots_subsys; | 65 | struct kset pci_hotplug_slots_subsys; |
66 | 66 | ||
67 | static ssize_t hotplug_slot_attr_show(struct kobject *kobj, | 67 | static ssize_t hotplug_slot_attr_show(struct kobject *kobj, |
68 | struct attribute *attr, char *buf) | 68 | struct attribute *attr, char *buf) |
@@ -764,7 +764,7 @@ static int __init pci_hotplug_init (void) | |||
764 | { | 764 | { |
765 | int result; | 765 | int result; |
766 | 766 | ||
767 | kset_set_kset_s(&pci_hotplug_slots_subsys, pci_bus_type.subsys); | 767 | kobj_set_kset_s(&pci_hotplug_slots_subsys, pci_bus_type.subsys); |
768 | result = subsystem_register(&pci_hotplug_slots_subsys); | 768 | result = subsystem_register(&pci_hotplug_slots_subsys); |
769 | if (result) { | 769 | if (result) { |
770 | err("Register subsys with error %d\n", result); | 770 | err("Register subsys with error %d\n", result); |