Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target...

[karo-tx-linux.git] / arch / x86 / include / asm / device.h

diff --git a/arch/x86/include/asm/device.h b/arch/x86/include/asm/device.h
index 93e1c55f14ab42503be641ed305eb6863f52a200..03dd72957d2f635a570fa26a978ddb0e26027873 100644 (file)
--- a/arch/x86/include/asm/device.h
+++ b/arch/x86/include/asm/device.h
@@ -2,9 +2,6 @@
 #define _ASM_X86_DEVICE_H
 
 struct dev_archdata {
-#ifdef CONFIG_ACPI
-       void    *acpi_handle;
-#endif
 #ifdef CONFIG_X86_DEV_DMA_OPS
        struct dma_map_ops *dma_ops;
 #endif