diff options
author | Jon Loeliger <jdl@freescale.com> | 2006-08-09 14:41:17 -0500 |
---|---|---|
committer | Jon Loeliger <jdl@freescale.com> | 2006-08-09 14:41:17 -0500 |
commit | 92c427b18982167064de454ae5248ec466998919 (patch) | |
tree | a60a3a9e3f3dec07edf6e6505bfc45c9e0a2dc01 /drivers | |
parent | 281f69ede28cd3d8be5d62a96b5a0b73e6065858 (diff) | |
parent | 34c3c0e01dbf1f8cc2bd08de92f2b89ba84921eb (diff) |
Merge branch 'mpc85xx'
Conflicts:
include/ft_build.h
include/pci.h
Resolved, though.
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/pci_auto.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci_auto.c b/drivers/pci_auto.c index 9e921b2148..969167555e 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) { |