diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-02-27 13:27:34 -0500 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-02-27 13:27:34 -0500 |
| commit | f3b270a47882b958e9e3c5bd86894e3a7072899a (patch) | |
| tree | de3bdfd5d67e8310257b93ac3d8d703599b9d929 /arch/powerpc/platforms/maple/pci.c | |
| parent | 116ad29d9839610d2811a1962cac7f3f2a9f9295 (diff) | |
| parent | b9a33cebac70d6f67a769ce8d4078fee2b254ada (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/powerpc/platforms/maple/pci.c')
| -rw-r--r-- | arch/powerpc/platforms/maple/pci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/maple/pci.c b/arch/powerpc/platforms/maple/pci.c index 7d4099a34f9..85d6c93659c 100644 --- a/arch/powerpc/platforms/maple/pci.c +++ b/arch/powerpc/platforms/maple/pci.c @@ -435,8 +435,8 @@ void __init maple_pci_init(void) PCI_DN(np)->busno = 0xf0; } - /* Tell pci.c to use the common resource allocation mecanism */ - pci_probe_only = 0; + /* Tell pci.c to not change any resource allocations. */ + pci_probe_only = 1; /* Allow all IO */ io_page_mask = -1; |