summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorJon Loeliger <jdl@freescale.com>2006-08-09 14:41:17 -0500
committerJon Loeliger <jdl@freescale.com>2006-08-09 14:41:17 -0500
commit92c427b18982167064de454ae5248ec466998919 (patch)
treea60a3a9e3f3dec07edf6e6505bfc45c9e0a2dc01 /drivers
parent281f69ede28cd3d8be5d62a96b5a0b73e6065858 (diff)
parent34c3c0e01dbf1f8cc2bd08de92f2b89ba84921eb (diff)
downloadu-boot-imx-92c427b18982167064de454ae5248ec466998919.zip
u-boot-imx-92c427b18982167064de454ae5248ec466998919.tar.gz
u-boot-imx-92c427b18982167064de454ae5248ec466998919.tar.bz2
Merge branch 'mpc85xx'
Conflicts: include/ft_build.h include/pci.h Resolved, though.
Diffstat (limited to 'drivers')
-rw-r--r--drivers/pci_auto.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci_auto.c b/drivers/pci_auto.c
index 9e921b2..9691675 100644
--- a/drivers/pci_auto.c
+++ b/drivers/pci_auto.c
@@ -187,7 +187,7 @@ static void pciauto_prescan_setup_bridge(struct pci_controller *hose,
} else {
/* We don't support prefetchable memory for now, so disable */
pci_hose_write_config_word(hose, dev, PCI_PREF_MEMORY_BASE, 0x1000);
- pci_hose_write_config_word(hose, dev, PCI_PREF_MEMORY_LIMIT, 0x1000);
+ pci_hose_write_config_word(hose, dev, PCI_PREF_MEMORY_LIMIT, 0x0);
}
if (pci_io) {