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>
This commit is contained in:
Linus Walleij 2012-03-03 10:05:08 +00:00 committed by Wolfgang Denk
parent d01b17611b
commit a1e47b66d9
5 changed files with 1 additions and 4 deletions

View File

@ -29,7 +29,6 @@
#include <pci.h>
#ifdef CONFIG_PCI_PNP
void pciauto_config_init(struct pci_controller *hose);
int pciauto_region_allocate(struct pci_region* res, unsigned int size, unsigned int *bar);
#endif

View File

@ -29,7 +29,6 @@
#include <pci.h>
#ifdef CONFIG_PCI_PNP
void pciauto_config_init(struct pci_controller *hose);
int pciauto_region_allocate(struct pci_region* res, unsigned int size, unsigned int *bar);
#endif

View File

@ -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

View File

@ -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)

View File

@ -527,6 +527,7 @@ extern void pciauto_setup_device(struct pci_controller *hose,
struct pci_region *mem,
struct pci_region *prefetch,
struct pci_region *io);
extern void pciauto_config_init(struct pci_controller *hose);
int pciauto_config_device(struct pci_controller *hose, pci_dev_t dev);
extern pci_dev_t pci_find_device (unsigned int vendor, unsigned int device, int index);