aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/hotplug/pciehprm_acpi.c
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/pciehprm_acpi.c
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/pciehprm_acpi.c')
-rw-r--r--drivers/pci/hotplug/pciehprm_acpi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/hotplug/pciehprm_acpi.c b/drivers/pci/hotplug/pciehprm_acpi.c
index 4d013f86b1a5..ae244e218620 100644
--- a/drivers/pci/hotplug/pciehprm_acpi.c
+++ b/drivers/pci/hotplug/pciehprm_acpi.c
@@ -169,7 +169,7 @@ static int is_root_bridge(acpi_handle handle)
169 return 0; 169 return 0;
170} 170}
171 171
172int get_hp_hw_control_from_firmware(struct pci_dev *dev) 172int pciehp_get_hp_hw_control_from_firmware(struct pci_dev *dev)
173{ 173{
174 acpi_status status; 174 acpi_status status;
175 acpi_handle chandle, handle = DEVICE_ACPI_HANDLE(&(dev->dev)); 175 acpi_handle chandle, handle = DEVICE_ACPI_HANDLE(&(dev->dev));
@@ -228,7 +228,7 @@ int get_hp_hw_control_from_firmware(struct pci_dev *dev)
228 return -1; 228 return -1;
229} 229}
230 230
231void get_hp_params_from_firmware(struct pci_dev *dev, 231void pciehp_get_hp_params_from_firmware(struct pci_dev *dev,
232 struct hotplug_params *hpp) 232 struct hotplug_params *hpp)
233{ 233{
234 acpi_status status = AE_NOT_FOUND; 234 acpi_status status = AE_NOT_FOUND;