diff options
author | Wolfgang Denk <wd@denx.de> | 2009-11-15 23:13:40 +0100 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2009-11-15 23:13:40 +0100 |
commit | 06f43286c6354aaab0103615e83893512f86eee7 (patch) | |
tree | c0c6bc4819fa381a9e1a2a051492eb4813bd410b /board/sbc8548 | |
parent | c758e947aa7d39a2be607ecdedd818ad300807b2 (diff) | |
parent | 3c014f1586d5bfe30dca7549396915c83f31cd30 (diff) | |
download | blackbird-obmc-uboot-06f43286c6354aaab0103615e83893512f86eee7.tar.gz blackbird-obmc-uboot-06f43286c6354aaab0103615e83893512f86eee7.zip |
Merge branch 'master' into next
Diffstat (limited to 'board/sbc8548')
-rw-r--r-- | board/sbc8548/sbc8548.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/board/sbc8548/sbc8548.c b/board/sbc8548/sbc8548.c index 5e3e17658d..194f6ab961 100644 --- a/board/sbc8548/sbc8548.c +++ b/board/sbc8548/sbc8548.c @@ -359,7 +359,7 @@ pci_init_board(void) SET_STD_PCI_INFO(pci_info[num], 1); first_free_busno = fsl_pci_init_port(&pci_info[num++], - &pci1_hose, first_free_busno, 0); + &pci1_hose, first_free_busno); } else { printf (" PCI: disabled\n"); } @@ -378,7 +378,7 @@ pci_init_board(void) SET_STD_PCIE_INFO(pci_info[num], 1); printf (" PCIE at base address %lx\n", pci_info[num].regs); first_free_busno = fsl_pci_init_port(&pci_info[num++], - &pcie1_hose, first_free_busno, 0); + &pcie1_hose, first_free_busno); } else { printf (" PCIE: disabled\n"); } |