Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[powerpc.git] / include / asm-i386 / device.h

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