diff options
author | Kristen Carlson Accardi <kristen.c.accardi@intel.com> | 2007-03-21 14:45:31 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-05-02 22:02:34 -0400 |
commit | e325e1f0783382298141c74737712637943c6063 (patch) | |
tree | fb82d5af6ab5f77836466cd6a4bf99ec1932467a /drivers/pci/hotplug/shpchp_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/shpchp_ctrl.c')
-rw-r--r-- | drivers/pci/hotplug/shpchp_ctrl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/hotplug/shpchp_ctrl.c b/drivers/pci/hotplug/shpchp_ctrl.c index b746bd265bc6..2c94d44279a3 100644 --- a/drivers/pci/hotplug/shpchp_ctrl.c +++ b/drivers/pci/hotplug/shpchp_ctrl.c | |||
@@ -433,7 +433,7 @@ static void shpchp_pushbutton_thread(struct work_struct *work) | |||
433 | kfree(info); | 433 | kfree(info); |
434 | } | 434 | } |
435 | 435 | ||
436 | void queue_pushbutton_work(struct work_struct *work) | 436 | void shpchp_queue_pushbutton_work(struct work_struct *work) |
437 | { | 437 | { |
438 | struct slot *p_slot = container_of(work, struct slot, work.work); | 438 | struct slot *p_slot = container_of(work, struct slot, work.work); |
439 | struct pushbutton_work_info *info; | 439 | struct pushbutton_work_info *info; |