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/pciehp_hpc.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/pciehp_hpc.c')
-rw-r--r-- | drivers/pci/hotplug/pciehp_hpc.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 | } |