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_titan.c | |
| parent | PCI: add pci_clear_flags() (diff) | |
| download | linux-dev-151d16d531c5bc60bad9dc62102be18f11b4280a.tar.xz linux-dev-151d16d531c5bc60bad9dc62102be18f11b4280a.zip | |
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_titan.c')
| -rw-r--r-- | arch/alpha/kernel/sys_titan.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/alpha/kernel/sys_titan.c b/arch/alpha/kernel/sys_titan.c index f47b30a2a117..b8eafa053539 100644 --- a/arch/alpha/kernel/sys_titan.c +++ b/arch/alpha/kernel/sys_titan.c @@ -331,7 +331,8 @@ titan_init_pci(void) */ titan_late_init(); - pci_probe_only = 1; + /* Indicate that we trust the console to configure things properly */ + pci_set_flags(PCI_PROBE_ONLY); common_init_pci(); SMC669_Init(0); locate_and_init_vga(NULL); |