Merge tag 'pci-v3.9-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / arch / x86 / include / asm / pci.h

diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h
index c28fd02f4bf76e3fc7cc65bbfb946d5c324101f2..d9e9e6c7ed321c24ad46bd852b1f65da936872e4 100644 (file)
--- a/arch/x86/include/asm/pci.h
+++ b/arch/x86/include/asm/pci.h
@@ -14,6 +14,9 @@
 struct pci_sysdata {
        int             domain;         /* PCI domain */
        int             node;           /* NUMA node */
+#ifdef CONFIG_ACPI
+       void            *acpi;          /* ACPI-specific data */
+#endif
 #ifdef CONFIG_X86_64
        void            *iommu;         /* IOMMU private data */
 #endif