diff options
| author | Kristen Carlson Accardi | 2007-03-21 19:45:31 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2007-05-03 04:02:34 +0200 |
| commit | e325e1f0783382298141c74737712637943c6063 (patch) | |
| tree | fb82d5af6ab5f77836466cd6a4bf99ec1932467a /drivers/pci/hotplug/pciehp_core.c | |
| parent | pciehp: Adapt to device driver model (diff) | |
| download | kernel-qcow2-linux-e325e1f0783382298141c74737712637943c6063.tar.gz kernel-qcow2-linux-e325e1f0783382298141c74737712637943c6063.tar.xz kernel-qcow2-linux-e325e1f0783382298141c74737712637943c6063.zip | |
PCI: fix multiple definition of `queue_pushbutton_work'
Fix duplicate names in shpchp and pciehp.
Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/pci/hotplug/pciehp_core.c')
| -rw-r--r-- | drivers/pci/hotplug/pciehp_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c index 0550edf0ce25..e5d3f0b4f45a 100644 --- a/drivers/pci/hotplug/pciehp_core.c +++ b/drivers/pci/hotplug/pciehp_core.c @@ -229,7 +229,7 @@ static int init_slots(struct controller *ctrl) slot->hpc_ops = ctrl->hpc_ops; slot->number = ctrl->first_slot; mutex_init(&slot->lock); - INIT_DELAYED_WORK(&slot->work, queue_pushbutton_work); + INIT_DELAYED_WORK(&slot->work, pciehp_queue_pushbutton_work); /* register this slot with the hotplug pci core */ hotplug_slot->private = slot; |