diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-07-29 09:15:36 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-07-29 09:15:36 +0200 |
| commit | 03a14104f1ccd395caa774c077b4305963afebf7 (patch) | |
| tree | 49b165ddbebd1006f07e1eadb556079056936bdc /drivers | |
| parent | 3cb7a4805fc8fb4c09e4801e1c7d531186f20190 (diff) | |
| parent | c2e49f706ba13213f3c8da3a33e88010214e1997 (diff) | |
| download | u-boot-imx-03a14104f1ccd395caa774c077b4305963afebf7.zip u-boot-imx-03a14104f1ccd395caa774c077b4305963afebf7.tar.gz u-boot-imx-03a14104f1ccd395caa774c077b4305963afebf7.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/pci/pci_auto.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/pci_auto.c b/drivers/pci/pci_auto.c index 35c82b9..82e4eed 100644 --- a/drivers/pci/pci_auto.c +++ b/drivers/pci/pci_auto.c @@ -403,7 +403,7 @@ int pciauto_config_device(struct pci_controller *hose, pci_dev_t dev) PCI_DEV(dev)); break; #endif -#ifdef CONFIG_MPC834x +#if defined(CONFIG_MPC834x) && !defined(CONFIG_VME8349) case PCI_CLASS_BRIDGE_OTHER: /* * The host/PCI bridge 1 seems broken in 8349 - it presents |