diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 16:39:59 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 16:39:59 -0400 |
commit | 0679c2f47d50651018dd5e0bf35330f6e6ae35ec (patch) | |
tree | 2df65ebb958f930abf0b7ad35fd6e528398b1679 /arch/x86/pci/pci.h | |
parent | 76fbc263ff7e42ce8b21b8aee176e3c74b45f81a (diff) | |
parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) |
Merge branch 'linus' into pci-for-jesse
Diffstat (limited to 'arch/x86/pci/pci.h')
-rw-r--r-- | arch/x86/pci/pci.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/arch/x86/pci/pci.h b/arch/x86/pci/pci.h index 720c4c554534..3e25deb821ac 100644 --- a/arch/x86/pci/pci.h +++ b/arch/x86/pci/pci.h | |||
@@ -27,6 +27,8 @@ | |||
27 | #define PCI_CAN_SKIP_ISA_ALIGN 0x8000 | 27 | #define PCI_CAN_SKIP_ISA_ALIGN 0x8000 |
28 | #define PCI_USE__CRS 0x10000 | 28 | #define PCI_USE__CRS 0x10000 |
29 | #define PCI_CHECK_ENABLE_AMD_MMCONF 0x20000 | 29 | #define PCI_CHECK_ENABLE_AMD_MMCONF 0x20000 |
30 | #define PCI_HAS_IO_ECS 0x40000 | ||
31 | #define PCI_NOASSIGN_ROMS 0x80000 | ||
30 | 32 | ||
31 | extern unsigned int pci_probe; | 33 | extern unsigned int pci_probe; |
32 | extern unsigned long pirq_table_addr; | 34 | extern unsigned long pirq_table_addr; |
@@ -38,9 +40,6 @@ enum pci_bf_sort_state { | |||
38 | pci_dmi_bf, | 40 | pci_dmi_bf, |
39 | }; | 41 | }; |
40 | 42 | ||
41 | extern void __init dmi_check_pciprobe(void); | ||
42 | extern void __init dmi_check_skip_isa_align(void); | ||
43 | |||
44 | /* pci-i386.c */ | 43 | /* pci-i386.c */ |
45 | 44 | ||
46 | extern unsigned int pcibios_max_latency; | 45 | extern unsigned int pcibios_max_latency; |
@@ -98,10 +97,19 @@ extern struct pci_raw_ops *raw_pci_ext_ops; | |||
98 | 97 | ||
99 | extern struct pci_raw_ops pci_direct_conf1; | 98 | extern struct pci_raw_ops pci_direct_conf1; |
100 | 99 | ||
100 | /* arch_initcall level */ | ||
101 | extern int pci_direct_probe(void); | 101 | extern int pci_direct_probe(void); |
102 | extern void pci_direct_init(int type); | 102 | extern void pci_direct_init(int type); |
103 | extern void pci_pcbios_init(void); | 103 | extern void pci_pcbios_init(void); |
104 | extern int pci_olpc_init(void); | 104 | extern int pci_olpc_init(void); |
105 | extern void __init dmi_check_pciprobe(void); | ||
106 | extern void __init dmi_check_skip_isa_align(void); | ||
107 | |||
108 | /* some common used subsys_initcalls */ | ||
109 | extern int __init pci_acpi_init(void); | ||
110 | extern int __init pcibios_irq_init(void); | ||
111 | extern int __init pci_numa_init(void); | ||
112 | extern int __init pcibios_init(void); | ||
105 | 113 | ||
106 | /* pci-mmconfig.c */ | 114 | /* pci-mmconfig.c */ |
107 | 115 | ||