Merge branch 'x86/gart' into x86/core

This commit is contained in:
Ingo Molnar 2008-07-10 10:43:11 +02:00
commit 849567b936

View file

@ -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 *);