aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/hotplug/pciehp.h
diff options
context:
space:
mode:
authorRajesh Shah <rajesh.shah@intel.com>2005-11-07 16:37:36 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2005-11-10 19:09:18 -0500
commit6560aa5c430fd8a7002b6e7abc1ee6c42521b06b (patch)
treec4dd51dee374c621877434b48ac7512a818b7fbd /drivers/pci/hotplug/pciehp.h
parentb4033c1715cb5aa1dcb1a25bdaf71fea908bb3f1 (diff)
[PATCH] PCI: fix namespace clashes
Signed-off-by: Rajesh Shah <rajesh.shah@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/pci/hotplug/pciehp.h')
-rw-r--r--drivers/pci/hotplug/pciehp.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h
index e71f78318d6e..c42b68d3aa24 100644
--- a/drivers/pci/hotplug/pciehp.h
+++ b/drivers/pci/hotplug/pciehp.h
@@ -191,8 +191,8 @@ extern u8 pciehp_handle_power_fault (u8 hp_slot, void *inst_id);
191/* pci functions */ 191/* pci functions */
192extern int pciehp_configure_device (struct slot *p_slot); 192extern int pciehp_configure_device (struct slot *p_slot);
193extern int pciehp_unconfigure_device (struct slot *p_slot); 193extern int pciehp_unconfigure_device (struct slot *p_slot);
194extern int get_hp_hw_control_from_firmware(struct pci_dev *dev); 194extern int pciehp_get_hp_hw_control_from_firmware(struct pci_dev *dev);
195extern void get_hp_params_from_firmware(struct pci_dev *dev, 195extern void pciehp_get_hp_params_from_firmware(struct pci_dev *dev,
196 struct hotplug_params *hpp); 196 struct hotplug_params *hpp);
197 197
198 198