diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-12-31 08:19:48 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-12-31 08:19:48 +0100 |
commit | 818fa7f3908c7bd6c0045e9d94dc23a899ef6144 (patch) | |
tree | ad3435c3f57c8222ad61709b716168932f13be6c /arch/x86/include/asm/pci.h | |
parent | tracing/kmemtrace: export kmemtrace_mark_alloc_node() / kmemtrace_mark_free() (diff) | |
parent | Merge branch 'linus' into tracing/kmemtrace (diff) | |
download | linux-818fa7f3908c7bd6c0045e9d94dc23a899ef6144.tar.xz linux-818fa7f3908c7bd6c0045e9d94dc23a899ef6144.zip |
Merge branch 'tracing/kmemtrace' into tracing/kmemtrace2
Diffstat (limited to 'arch/x86/include/asm/pci.h')
-rw-r--r-- | arch/x86/include/asm/pci.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h index 647781298e7e..66834c41c049 100644 --- a/arch/x86/include/asm/pci.h +++ b/arch/x86/include/asm/pci.h @@ -84,6 +84,8 @@ static inline void pci_dma_burst_advice(struct pci_dev *pdev, static inline void early_quirks(void) { } #endif +extern void pci_iommu_alloc(void); + #endif /* __KERNEL__ */ #ifdef CONFIG_X86_32 |