diff options
| author | Peter Pearse <peter.pearse@arm.com> | 2007-09-18 11:12:58 +0100 |
|---|---|---|
| committer | Peter Pearse <peter.pearse@arm.com> | 2007-09-18 11:12:58 +0100 |
| commit | afd477b227c089f2b7ce0aadb20b9ea7dc6ee6f8 (patch) | |
| tree | 4b0d37a727b3ede6540825258cc930533c0cdce7 /board/stxssa/stxssa.c | |
| parent | d94c79e47011af5e8dd10ed6163c09b4cfc743cc (diff) | |
| parent | 67c31036acaaaa992fc346cc89db0909a7e733c4 (diff) | |
| download | u-boot-imx-afd477b227c089f2b7ce0aadb20b9ea7dc6ee6f8.zip u-boot-imx-afd477b227c089f2b7ce0aadb20b9ea7dc6ee6f8.tar.gz u-boot-imx-afd477b227c089f2b7ce0aadb20b9ea7dc6ee6f8.tar.bz2 | |
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'board/stxssa/stxssa.c')
| -rw-r--r-- | board/stxssa/stxssa.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/board/stxssa/stxssa.c b/board/stxssa/stxssa.c index 9a2bfbe..9bacb98 100644 --- a/board/stxssa/stxssa.c +++ b/board/stxssa/stxssa.c @@ -381,9 +381,11 @@ static struct pci_config_table pci_stxgp3_config_table[] = { static struct pci_controller hose[] = { #ifndef CONFIG_PCI_PNP { config_table: pci_stxgp3_config_table,}, -#ifdef CONFIG_MPC85XX_PCI2 +#else {}, #endif +#ifdef CONFIG_MPC85XX_PCI2 + {}, #endif }; |