Merge branch 'x86/core' into x86/apic

[karo-tx-linux.git] / include / asm-x86 / device.h

diff --git a/include/asm-x86/device.h b/include/asm-x86/device.h
index d9ee5e52e91b28b9418c5a0ad61ff291ea0d51c9..1bece04c7d9d9b829d6d51abe191ce1b8abf0da9 100644 (file)
--- a/include/asm-x86/device.h
+++ b/include/asm-x86/device.h
@@ -1,10 +1,16 @@
-#ifndef _ASM_X86_DEVICE_H
-#define _ASM_X86_DEVICE_H
+#ifndef ASM_X86__DEVICE_H
+#define ASM_X86__DEVICE_H
 
 struct dev_archdata {
 #ifdef CONFIG_ACPI
        void    *acpi_handle;
 #endif
+#ifdef CONFIG_X86_64
+struct dma_mapping_ops *dma_ops;
+#endif
+#ifdef CONFIG_DMAR
+       void *iommu; /* hook for IOMMU specific extension */
+#endif
 };
 
-#endif /* _ASM_X86_DEVICE_H */
+#endif /* ASM_X86__DEVICE_H */