aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci
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
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')
-rw-r--r--drivers/pci/hotplug/pciehp.h4
-rw-r--r--drivers/pci/hotplug/pciehp_hpc.c2
-rw-r--r--drivers/pci/hotplug/pciehprm_acpi.c4
-rw-r--r--drivers/pci/hotplug/pciehprm_nonacpi.c4
4 files changed, 7 insertions, 7 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
diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c
index f2b9b7686f28..4a3cecca012c 100644
--- a/drivers/pci/hotplug/pciehp_hpc.c
+++ b/drivers/pci/hotplug/pciehp_hpc.c
@@ -1418,7 +1418,7 @@ int pcie_init(struct controller * ctrl, struct pcie_device *dev)
1418 dbg("Bypassing BIOS check for pciehp use on %s\n", 1418 dbg("Bypassing BIOS check for pciehp use on %s\n",
1419 pci_name(ctrl->pci_dev)); 1419 pci_name(ctrl->pci_dev));
1420 } else { 1420 } else {
1421 rc = get_hp_hw_control_from_firmware(ctrl->pci_dev); 1421 rc = pciehp_get_hp_hw_control_from_firmware(ctrl->pci_dev);
1422 if (rc) 1422 if (rc)
1423 goto abort_free_ctlr; 1423 goto abort_free_ctlr;
1424 } 1424 }
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;
diff --git a/drivers/pci/hotplug/pciehprm_nonacpi.c b/drivers/pci/hotplug/pciehprm_nonacpi.c
index 6447642f78c5..29180dfe8493 100644
--- a/drivers/pci/hotplug/pciehprm_nonacpi.c
+++ b/drivers/pci/hotplug/pciehprm_nonacpi.c
@@ -35,13 +35,13 @@
35#include <linux/slab.h> 35#include <linux/slab.h>
36#include "pciehp.h" 36#include "pciehp.h"
37 37
38void get_hp_params_from_firmware(struct pci_dev *dev, 38void pciehp_get_hp_params_from_firmware(struct pci_dev *dev,
39 struct hotplug_params *hpp) 39 struct hotplug_params *hpp)
40{ 40{
41 return; 41 return;
42} 42}
43 43
44int get_hp_hw_control_from_firmware(struct pci_dev *dev) 44int pciehp_get_hp_hw_control_from_firmware(struct pci_dev *dev)
45{ 45{
46 return 0; 46 return 0;
47} 47}