X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Fasm-x86%2Fdevice.h;h=87a715367a1b11a9db24d569682d22f780352be7;hb=13c48c490208d9e70d8d66d56f96c5054db69af7;hp=e2bcf7c7dcee6a73611eb68cd56481452e16e79d;hpb=547307420931344a868275bd7ea7a30f117a15a9;p=linux-2.6

diff --git a/include/asm-x86/device.h b/include/asm-x86/device.h
index e2bcf7c7dc..87a715367a 100644
--- 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 */