diff options
| author |   Rusty Russell <rusty@rustcorp.com.au> | 2008-12-13 21:55:51 +1030 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-13 21:55:51 +1030 |
| commit | 968ea6d80e395cf11a51143cfa1b9a14ada676df (patch) | |
| tree | dc2acec8c9bdced33afe1e273ee5e0b0b93d2703 /arch/x86/pci/pci.h | |
| parent | cpumask: Use all NR_CPUS bits unless CONFIG_CPUMASK_OFFSTACK (diff) | |
| parent | Merge branches 'irq/sparseirq', 'x86/quirks' and 'x86/reboot' into cpus4096 (diff) | |
| download | wireguard-linux-968ea6d80e395cf11a51143cfa1b9a14ada676df.tar.xz wireguard-linux-968ea6d80e395cf11a51143cfa1b9a14ada676df.zip | |
Merge ../linux-2.6-x86
Conflicts:
arch/x86/kernel/io_apic.c
kernel/sched.c
kernel/sched_stats.h
Diffstat (limited to 'arch/x86/pci/pci.h')
| -rw-r--r-- | arch/x86/pci/pci.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/pci/pci.h b/arch/x86/pci/pci.h index 15b9cf6be729..1959018aac02 100644 --- a/arch/x86/pci/pci.h +++ b/arch/x86/pci/pci.h @@ -96,6 +96,7 @@ extern struct pci_raw_ops *raw_pci_ops; extern struct pci_raw_ops *raw_pci_ext_ops; extern struct pci_raw_ops pci_direct_conf1; +extern bool port_cf9_safe; /* arch_initcall level */ extern int pci_direct_probe(void); |