diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-03-08 17:49:24 +0100 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-03-08 17:49:24 +0100 |
| commit | 9446389ef612096704fdf18fa79bab423d4110f0 (patch) | |
| tree | 3e4fda7270be58ae176d20d318e61fb115b325b5 /drivers/pci/hotplug/acpiphp_glue.c | |
| parent | Merge branch 'cleanups' into next (diff) | |
| parent | x86_64: make ptrace always sign-extend orig_ax to 64 bits (diff) | |
| download | linux-9446389ef612096704fdf18fa79bab423d4110f0.tar.xz linux-9446389ef612096704fdf18fa79bab423d4110f0.zip | |
Merge commit 'origin' into devel
Diffstat (limited to 'drivers/pci/hotplug/acpiphp_glue.c')
| -rw-r--r-- | drivers/pci/hotplug/acpiphp_glue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c index cf22f9e01e00..5e50008d1181 100644 --- a/drivers/pci/hotplug/acpiphp_glue.c +++ b/drivers/pci/hotplug/acpiphp_glue.c @@ -1085,7 +1085,7 @@ static int acpiphp_bus_trim(acpi_handle handle) * This function should be called per *physical slot*, * not per each slot object in ACPI namespace. */ -static int enable_device(struct acpiphp_slot *slot) +static int __ref enable_device(struct acpiphp_slot *slot) { struct pci_dev *dev; struct pci_bus *bus = slot->bridge->pci_bus; |