summaryrefslogtreecommitdiffstats
path: root/include/asm-i386/device.h
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2006-11-11 17:18:42 +1100
committerGreg Kroah-Hartman <gregkh@suse.de>2006-12-01 14:52:01 -0800
commit465ae641e4a3e5028aa9c85d3843259aa28a22ce (patch)
treea8f20c576d03dc40d67ad8b5ee5f9dec4f114a81 /include/asm-i386/device.h
parentc6dbaef22a2f78700e242915a13218dd780c89ff (diff)
ACPI: Change ACPI to use dev_archdata instead of firmware_data
Change ACPI to use dev_archdata instead of firmware_data This patch changes ACPI to use the new dev_archdata on i386, x86_64 and ia64 (is there any other arch using ACPI ?) to store it's acpi_handle. It also removes the firmware_data field from struct device as this was the only user. Only build-tested on x86 Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Len Brown <lenb@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include/asm-i386/device.h')
-rw-r--r--include/asm-i386/device.h10
1 files changed, 9 insertions, 1 deletions
diff --git a/include/asm-i386/device.h b/include/asm-i386/device.h
index d8f9872b0e2..849604c70e6 100644
--- 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 */