summaryrefslogtreecommitdiffstats
path: root/board/a3000/a3000.c
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2008-06-03 20:19:08 +0200
committerStefan Roese <sr@denx.de>2008-06-03 20:19:08 +0200
commit10a3367955bc2033b288915f8f10d0e507fe2fa1 (patch)
treec3ac82364df83db5d5cb963c64b863b77a20445c /board/a3000/a3000.c
parent97f7d27c8ecf34879d6b747c10fa9a18c02a4cc0 (diff)
parent1f1554841a4c8e069d331176f0c3059fb2bb8280 (diff)
downloadblackbird-obmc-uboot-10a3367955bc2033b288915f8f10d0e507fe2fa1.tar.gz
blackbird-obmc-uboot-10a3367955bc2033b288915f8f10d0e507fe2fa1.zip
Merge branch 'master' of /home/stefan/git/u-boot/u-boot
Diffstat (limited to 'board/a3000/a3000.c')
-rw-r--r--board/a3000/a3000.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/board/a3000/a3000.c b/board/a3000/a3000.c
index ab707ae970..737d35d76c 100644
--- a/board/a3000/a3000.c
+++ b/board/a3000/a3000.c
@@ -82,7 +82,7 @@ static struct pci_config_table pci_a3000_config_table[] = {
PCI_COMMAND_MEMORY |
PCI_COMMAND_MASTER }},
{ PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
- PCI_ANY_ID, 0x15, PCI_ANY_ID, /* PCI slot2 */
+ PCI_ANY_ID, 0x15, PCI_ANY_ID, /* PCI slot2 */
pci_cfgfunc_config_device, { PCI_ENET2_IOADDR,
PCI_ENET2_MEMADDR,
PCI_COMMAND_IO |
OpenPOWER on IntegriCloud