diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-02-23 22:05:47 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-02-23 22:05:47 -0500 |
| commit | a00428f5b149e36b8225b2a0812742a6dfb07b8c (patch) | |
| tree | a78869cd67cf78a0eb091fb0ea5d397734bd6738 /arch/powerpc/platforms/maple | |
| parent | 774fee58c465ea1c7e9775e347ec307bcf2deeb3 (diff) | |
| parent | fb5c594c2acc441f0d2d8f457484a0e0e9285db3 (diff) | |
Merge ../powerpc-merge
Diffstat (limited to 'arch/powerpc/platforms/maple')
| -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 7d4099a34f92..85d6c93659cc 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) | |||
| 435 | PCI_DN(np)->busno = 0xf0; | 435 | PCI_DN(np)->busno = 0xf0; |
| 436 | } | 436 | } |
| 437 | 437 | ||
| 438 | /* Tell pci.c to use the common resource allocation mecanism */ | 438 | /* Tell pci.c to not change any resource allocations. */ |
| 439 | pci_probe_only = 0; | 439 | pci_probe_only = 1; |
| 440 | 440 | ||
| 441 | /* Allow all IO */ | 441 | /* Allow all IO */ |
| 442 | io_page_mask = -1; | 442 | io_page_mask = -1; |