Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub/scm...
[linux-2.6.git] / arch / alpha / kernel / sys_marvel.c
index e8b4f6f..14a4b6a 100644 (file)
@@ -383,7 +383,8 @@ marvel_init_pci(void)
 
        marvel_register_error_handlers();
 
-       pci_probe_only = 1;
+       /* Indicate that we trust the console to configure things properly */
+       pci_set_flags(PCI_PROBE_ONLY);
        common_init_pci();
        locate_and_init_vga(NULL);