Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-2.6-omap-h63xx.git] / include / asm-ia64 / device.h

diff --git a/include/asm-ia64/device.h b/include/asm-ia64/device.h
index d8f9872b0e2dc3587a9e658adc957f093b7906fb..3db6daf7f25125dc36e45ff6cb4e360be3d399f3 100644 (file)
--- a/include/asm-ia64/device.h
+++ b/include/asm-ia64/device.h
@@ -3,5 +3,13 @@
  *
  * This file is released under the GPLv2
  */
-#include <asm-generic/device.h>
+#ifndef _ASM_IA64_DEVICE_H
+#define _ASM_IA64_DEVICE_H
 
+struct dev_archdata {
+#ifdef CONFIG_ACPI
+       void    *acpi_handle;
+#endif
+};
+
+#endif /* _ASM_IA64_DEVICE_H */