diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-08-28 00:26:52 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-08-28 00:26:52 +0200 |
| commit | 0ba6bfef061872dbe04e6bebbb225806c7fa34ec (patch) | |
| tree | 25d0e07c2d902998c3a679aaf6bf4ffedff9289c /cpu/mpc85xx/pci.c | |
| parent | d26b739afe5a6760bd345743188759cd9d0f3b47 (diff) | |
| parent | 9cff4448a9cb882defe6c8bde73b77fc0c636799 (diff) | |
| download | u-boot-imx-0ba6bfef061872dbe04e6bebbb225806c7fa34ec.zip u-boot-imx-0ba6bfef061872dbe04e6bebbb225806c7fa34ec.tar.gz u-boot-imx-0ba6bfef061872dbe04e6bebbb225806c7fa34ec.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'cpu/mpc85xx/pci.c')
| -rw-r--r-- | cpu/mpc85xx/pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpu/mpc85xx/pci.c b/cpu/mpc85xx/pci.c index a5060cd..fdc4c83 100644 --- a/cpu/mpc85xx/pci.c +++ b/cpu/mpc85xx/pci.c @@ -29,7 +29,7 @@ #include <asm/cpm_85xx.h> #include <pci.h> -#if defined(CONFIG_PCI) +#if defined(CONFIG_PCI) && !defined(CONFIG_FSL_PCI_INIT) static struct pci_controller *pci_hose; |