diff options
| author | Kristen Carlson Accardi <kristen.c.accardi@intel.com> | 2007-03-21 11:45:31 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-05-02 19:02:34 -0700 |
| commit | e325e1f0783382298141c74737712637943c6063 (patch) | |
| tree | fb82d5af6ab5f77836466cd6a4bf99ec1932467a /drivers/pci/hotplug/pciehp_ctrl.c | |
| parent | 9233352628bc8e284f66fc90c4dc74473db1fbc1 (diff) | |
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_ctrl.c')
| -rw-r--r-- | drivers/pci/hotplug/pciehp_ctrl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/hotplug/pciehp_ctrl.c b/drivers/pci/hotplug/pciehp_ctrl.c index 91441e5ae63..7f22caa7017 100644 --- a/drivers/pci/hotplug/pciehp_ctrl.c +++ b/drivers/pci/hotplug/pciehp_ctrl.c @@ -351,7 +351,7 @@ static void pciehp_power_thread(struct work_struct *work) kfree(info); } -void queue_pushbutton_work(struct work_struct *work) +void pciehp_queue_pushbutton_work(struct work_struct *work) { struct slot *p_slot = container_of(work, struct slot, work.work); struct power_work_info *info; |