Skip to content

L
linux-davinci
Commit 849567b9 authored by Ingo Molnar's avatar Ingo Molnar
Browse files
Options

Merge branch 'x86/gart' into x86/core

parents 3d43ecd2 8cbfd4f4
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
include/asm-x86/iommu.h
View file @ 849567b9
......@@ -5,7 +5,7 @@ extern void pci_iommu_shutdown(void);
extern void no_iommu_init(void);
extern int force_iommu, no_iommu;
extern int iommu_detected;
#ifdef CONFIG_IOMMU
#ifdef CONFIG_GART_IOMMU
extern void gart_iommu_init(void);
extern void gart_iommu_shutdown(void);
extern void __init gart_parse_options(char *);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment