diff options
| author | Len Brown <len.brown@intel.com> | 2008-10-22 23:25:26 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-10-22 23:25:26 -0400 |
| commit | 47bf31adc541bef0c20de15e800e0011f1ae70c7 (patch) | |
| tree | 28903879a8570eaefa57942ec3d475d365f5a465 /drivers/pci | |
| parent | 4538fad56ee1c16bce0294b5647d2551f0e03164 (diff) | |
| parent | 0a918a9432cc30aede10f904253b66ea6ab485ac (diff) | |
| download | op-kernel-dev-47bf31adc541bef0c20de15e800e0011f1ae70c7.zip op-kernel-dev-47bf31adc541bef0c20de15e800e0011f1ae70c7.tar.gz | |
Merge branch 'dock' into test
Conflicts:
drivers/acpi/osl.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/hotplug/acpiphp_glue.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c index a3e4705..db54c5e 100644 --- a/drivers/pci/hotplug/acpiphp_glue.c +++ b/drivers/pci/hotplug/acpiphp_glue.c @@ -169,7 +169,9 @@ static int post_dock_fixups(struct notifier_block *nb, unsigned long val, } - +static struct acpi_dock_ops acpiphp_dock_ops = { + .handler = handle_hotplug_event_func, +}; /* callback routine to register each ACPI PCI slot object */ static acpi_status @@ -285,7 +287,7 @@ register_slot(acpi_handle handle, u32 lvl, void *context, void **rv) */ newfunc->flags &= ~FUNC_HAS_EJ0; if (register_hotplug_dock_device(handle, - handle_hotplug_event_func, newfunc)) + &acpiphp_dock_ops, newfunc)) dbg("failed to register dock device\n"); /* we need to be notified when dock events happen |
