diff options
| author | Kristen Carlson Accardi <kristen.c.accardi@intel.com> | 2007-03-21 19:45:31 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-05-03 04:02:34 +0200 |
| commit | e325e1f0783382298141c74737712637943c6063 (patch) | |
| tree | fb82d5af6ab5f77836466cd6a4bf99ec1932467a /drivers/pci/hotplug/shpchp.h | |
| parent | pciehp: Adapt to device driver model (diff) | |
| download | linux-e325e1f0783382298141c74737712637943c6063.tar.xz 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/shpchp.h')
| -rw-r--r-- | drivers/pci/hotplug/shpchp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/hotplug/shpchp.h b/drivers/pci/hotplug/shpchp.h index 01d31a1f697c..37ed0884b972 100644 --- a/drivers/pci/hotplug/shpchp.h +++ b/drivers/pci/hotplug/shpchp.h @@ -166,7 +166,7 @@ extern u8 shpchp_handle_power_fault(u8 hp_slot, struct controller *ctrl); extern int shpchp_configure_device(struct slot *p_slot); extern int shpchp_unconfigure_device(struct slot *p_slot); extern void cleanup_slots(struct controller *ctrl); -extern void queue_pushbutton_work(struct work_struct *work); +extern void shpchp_queue_pushbutton_work(struct work_struct *work); extern int shpc_init( struct controller *ctrl, struct pci_dev *pdev); #ifdef CONFIG_ACPI |