Merge branch 'x86/um-header' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...

[linux-2.6-omap-h63xx.git] / arch / x86 / include / asm / iommu.h

diff --git a/include/asm-x86/iommu.h b/arch/x86/include/asm/iommu.h
similarity index 93%
rename from include/asm-x86/iommu.h
rename to arch/x86/include/asm/iommu.h
index 2daaffcda52f86df2c04d6359674dfb8511723fc..98e28ea8cd167afb5c1bf8bd3a04f320365e2edf 100644 (file)
--- a/include/asm-x86/iommu.h
+++ b/arch/x86/include/asm/iommu.h
@@ -1,5 +1,5 @@
-#ifndef ASM_X86__IOMMU_H
-#define ASM_X86__IOMMU_H
+#ifndef _ASM_X86_IOMMU_H
+#define _ASM_X86_IOMMU_H
 
 extern void pci_iommu_shutdown(void);
 extern void no_iommu_init(void);
@@ -47,4 +47,4 @@ static inline void gart_iommu_hole_init(void)
 }
 #endif
 
-#endif /* ASM_X86__IOMMU_H */
+#endif /* _ASM_X86_IOMMU_H */