summaryrefslogtreecommitdiff
path: root/include/asm-x86/device.h
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2007-10-15 13:57:47 +0200
committerThomas Gleixner <tglx@inhelltoy.tec.linutronix.de>2007-10-17 20:17:10 +0200
commit003a46cfff308ee0d879dfa89b9a7c65b2a481bf (patch)
tree234552110912d4b9d6519474823e98e1a1726d16 /include/asm-x86/device.h
parent217d115cd5d7d2bef7db7839b93ce5dc2867c392 (diff)
x86: unify some more trivial include/asm-x86/ 32/64 variants
Scripted unification. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/asm-x86/device.h')
-rw-r--r--include/asm-x86/device.h13
1 files changed, 9 insertions, 4 deletions
diff --git a/include/asm-x86/device.h b/include/asm-x86/device.h
index e2bcf7c7dcee..d9ee5e52e91b 100644
--- a/include/asm-x86/device.h
+++ b/include/asm-x86/device.h
@@ -1,5 +1,10 @@
-#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
+};
+
+#endif /* _ASM_X86_DEVICE_H */