diff options
| author | Rajesh Shah <rajesh.shah@intel.com> | 2005-11-07 13:37:36 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-11-10 16:09:18 -0800 |
| commit | 6560aa5c430fd8a7002b6e7abc1ee6c42521b06b (patch) | |
| tree | c4dd51dee374c621877434b48ac7512a818b7fbd /drivers/pci/hotplug/pciehprm_acpi.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_acpi.c')
| -rw-r--r-- | drivers/pci/hotplug/pciehprm_acpi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/hotplug/pciehprm_acpi.c b/drivers/pci/hotplug/pciehprm_acpi.c index 4d013f86b1a..ae244e21862 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) return 0; } -int get_hp_hw_control_from_firmware(struct pci_dev *dev) +int pciehp_get_hp_hw_control_from_firmware(struct pci_dev *dev) { acpi_status status; acpi_handle chandle, handle = DEVICE_ACPI_HANDLE(&(dev->dev)); @@ -228,7 +228,7 @@ int get_hp_hw_control_from_firmware(struct pci_dev *dev) return -1; } -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) { acpi_status status = AE_NOT_FOUND; |