diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-30 13:57:06 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-30 13:57:06 +1000 |
| commit | 583e5136f69588ffbc4f0cc5c2c2592f455ef5f6 (patch) | |
| tree | d70ce617254d0e6f9102496dbe2471e39b57eafb /drivers/pci/hotplug/acpiphp_ibm.c | |
| parent | c5943c881bfc77b5380f936745bf5f92503d89f5 (diff) | |
| parent | 0aea531326d1a17ccef7d9a538429c5b32cf4f12 (diff) | |
Merge commit 'pci/linux-next'
Conflicts:
arch/x86/kernel/setup_64.c
arch/x86/pci/irq.c
arch/x86/pci/pci.h
include/linux/device.h
Diffstat (limited to 'drivers/pci/hotplug/acpiphp_ibm.c')
| -rw-r--r-- | drivers/pci/hotplug/acpiphp_ibm.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c index ede9051fdb5d..2b7c45e39370 100644 --- a/drivers/pci/hotplug/acpiphp_ibm.c +++ b/drivers/pci/hotplug/acpiphp_ibm.c @@ -33,8 +33,10 @@ #include <linux/kobject.h> #include <asm/uaccess.h> #include <linux/moduleparam.h> +#include <linux/pci.h> #include "acpiphp.h" +#include "../pci.h" #define DRIVER_VERSION "1.0.1" #define DRIVER_AUTHOR "Irene Zubarev <zubarev@us.ibm.com>, Vernon Mauery <vernux@us.ibm.com>" @@ -430,7 +432,7 @@ static int __init ibm_acpiphp_init(void) int retval = 0; acpi_status status; struct acpi_device *device; - struct kobject *sysdir = &pci_hotplug_slots_kset->kobj; + struct kobject *sysdir = &pci_slots_kset->kobj; dbg("%s\n", __func__); @@ -477,7 +479,7 @@ init_return: static void __exit ibm_acpiphp_exit(void) { acpi_status status; - struct kobject *sysdir = &pci_hotplug_slots_kset->kobj; + struct kobject *sysdir = &pci_slots_kset->kobj; dbg("%s\n", __func__); |