lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'x86/gart' into x86/core

Browse Source
This commit is contained in:
Ingo Molnar
2008-07-10 10:43:11 +02:00
parent 3d43ecd286 8cbfd4f44d
commit 849567b936
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/asm-x86/iommu.h
View File

@@ -5,7 +5,7 @@ extern void pci_iommu_shutdown(void);
extern void no_iommu_init(void); extern void no_iommu_init(void);
extern int force_iommu, no_iommu; extern int force_iommu, no_iommu;
extern int iommu_detected; extern int iommu_detected;
#ifdef CONFIG_IOMMU #ifdef CONFIG_GART_IOMMU
extern void gart_iommu_init(void); extern void gart_iommu_init(void);
extern void gart_iommu_shutdown(void); extern void gart_iommu_shutdown(void);
extern void __init gart_parse_options(char *); extern void __init gart_parse_options(char *);