diff options
author | Rajesh Shah <rajesh.shah@intel.com> | 2005-11-07 16:37:36 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-11-10 19:09:18 -0500 |
commit | 6560aa5c430fd8a7002b6e7abc1ee6c42521b06b (patch) | |
tree | c4dd51dee374c621877434b48ac7512a818b7fbd /drivers/pci/hotplug/pciehprm_nonacpi.c | |
parent | b4033c1715cb5aa1dcb1a25bdaf71fea908bb3f1 (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.c | 4 |
1 files changed, 2 insertions, 2 deletions
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 | ||
38 | void get_hp_params_from_firmware(struct pci_dev *dev, | 38 | void 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 | ||
44 | int get_hp_hw_control_from_firmware(struct pci_dev *dev) | 44 | int pciehp_get_hp_hw_control_from_firmware(struct pci_dev *dev) |
45 | { | 45 | { |
46 | return 0; | 46 | return 0; |
47 | } | 47 | } |