x86: clean up pte_exec

[sfrench/cifs-2.6.git] / include / asm-x86 / device.h

diff --git a/include/asm-x86/device.h b/include/asm-x86/device.h
index e2bcf7c7dcee6a73611eb68cd56481452e16e79d..87a715367a1b11a9db24d569682d22f780352be7 100644 (file)
--- a/include/asm-x86/device.h
+++ b/include/asm-x86/device.h
@@ -1,5 +1,13 @@
-#ifdef CONFIG_X86_32
-# include "device_32.h"
-#else
-# include "device_64.h"
+#ifndef _ASM_X86_DEVICE_H
+#define _ASM_X86_DEVICE_H
+
+struct dev_archdata {
+#ifdef CONFIG_ACPI
+       void    *acpi_handle;
 #endif
+#ifdef CONFIG_DMAR
+       void *iommu; /* hook for IOMMU specific extension */
+#endif
+};
+
+#endif /* _ASM_X86_DEVICE_H */