diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2012-02-23 20:18:56 -0700 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-02-23 20:18:56 -0700 |
| commit | 151d16d531c5bc60bad9dc62102be18f11b4280a (patch) | |
| tree | 12c678faac055726ce9c6209b939de44c3b88375 /arch/alpha/kernel/sys_marvel.c | |
| parent | dcce6dc486816d5e1a14e066f611100624421e3a (diff) | |
| download | linux-0-day-151d16d531c5bc60bad9dc62102be18f11b4280a.tar.gz linux-0-day-151d16d531c5bc60bad9dc62102be18f11b4280a.tar.xz | |
alpha/PCI: replace pci_probe_only with pci_flags
Some architectures (alpha, mips, powerpc) have an arch-specific
"pci_probe_only" flag. Others use PCI_PROBE_ONLY in pci_flags for
the same purpose. This moves alpha to the pci_flags approach so
generic code can use the same test across all architectures.
CC: linux-alpha@vger.kernel.org
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'arch/alpha/kernel/sys_marvel.c')
| -rw-r--r-- | arch/alpha/kernel/sys_marvel.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/alpha/kernel/sys_marvel.c b/arch/alpha/kernel/sys_marvel.c index 95cfc83ece8f7..fc8b125086115 100644 --- a/arch/alpha/kernel/sys_marvel.c +++ b/arch/alpha/kernel/sys_marvel.c @@ -384,7 +384,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); |