summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2012-03-03 10:05:08 +0000
committerWolfgang Denk <wd@denx.de>2012-03-04 21:13:33 +0100
commita1e47b66d98f5caf19895965cfe38c176bbf01e8 (patch)
tree1636ac2a7ded404aec6adb8d1465b422ad4e157a /drivers
parentd01b17611b01928b862756d86b20eaaa0ff60fb0 (diff)
downloadu-boot-imx-a1e47b66d98f5caf19895965cfe38c176bbf01e8.zip
u-boot-imx-a1e47b66d98f5caf19895965cfe38c176bbf01e8.tar.gz
u-boot-imx-a1e47b66d98f5caf19895965cfe38c176bbf01e8.tar.bz2
pci: move pciauto_config_init() to pci.h
Fixing build regressions for the Integrator I get find that a few boards try to work around the missing declaration of pciauto_config_init() by declaring it in the local scope. This does not make sense when the sibling functions are in <pci.h> so move the function to the header, ridding the build error in the Integrator and getting rid of the local declarations here and there. Reported-by: Wolfgang Denk <wd@denx.de> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/pci/fsl_pci_init.c1
-rw-r--r--drivers/pci/pci.c1
2 files changed, 0 insertions, 2 deletions
diff --git a/drivers/pci/fsl_pci_init.c b/drivers/pci/fsl_pci_init.c
index bff1314..d04a08c 100644
--- a/drivers/pci/fsl_pci_init.c
+++ b/drivers/pci/fsl_pci_init.c
@@ -51,7 +51,6 @@ void pciauto_prescan_setup_bridge(struct pci_controller *hose,
pci_dev_t dev, int sub_bus);
void pciauto_postscan_setup_bridge(struct pci_controller *hose,
pci_dev_t dev, int sub_bus);
-void pciauto_config_init(struct pci_controller *hose);
#ifndef CONFIG_SYS_PCI_MEMORY_BUS
#define CONFIG_SYS_PCI_MEMORY_BUS 0
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 5f1f128..398542b 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -516,7 +516,6 @@ void pci_cfgfunc_do_nothing(struct pci_controller *hose,
* to get the correct result when scanning bridges
*/
extern int pciauto_config_device(struct pci_controller *hose, pci_dev_t dev);
-extern void pciauto_config_init(struct pci_controller *hose);
#if defined(CONFIG_CMD_PCI) || defined(CONFIG_PCI_SCAN_SHOW)
const char * pci_class_str(u8 class)