summaryrefslogtreecommitdiffstats
path: root/drivers/pci/hotplug/pciehprm_nonacpi.c
diff options
context:
space:
mode:
authorRajesh Shah <rajesh.shah@intel.com>2005-11-07 13:37:36 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2005-11-10 16:09:18 -0800
commit6560aa5c430fd8a7002b6e7abc1ee6c42521b06b (patch)
treec4dd51dee374c621877434b48ac7512a818b7fbd /drivers/pci/hotplug/pciehprm_nonacpi.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_nonacpi.c')
-rw-r--r--drivers/pci/hotplug/pciehprm_nonacpi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/hotplug/pciehprm_nonacpi.c b/drivers/pci/hotplug/pciehprm_nonacpi.c
index 6447642f78c..29180dfe849 100644
--- a/drivers/pci/hotplug/pciehprm_nonacpi.c
+++ b/drivers/pci/hotplug/pciehprm_nonacpi.c
@@ -35,13 +35,13 @@
#include <linux/slab.h>
#include "pciehp.h"
-void get_hp_params_from_firmware(struct pci_dev *dev,
+void pciehp_get_hp_params_from_firmware(struct pci_dev *dev,
struct hotplug_params *hpp)
{
return;
}
-int get_hp_hw_control_from_firmware(struct pci_dev *dev)
+int pciehp_get_hp_hw_control_from_firmware(struct pci_dev *dev)
{
return 0;
}