Merge commit 'v2.6.35-rc1' into amd-iommu/2.6.35

[mv-sheeva.git] / include / linux / pci.h

diff --git a/include/linux/pci.h b/include/linux/pci.h
index a327322a33abef0b74967f5bd0a82962d74e9ab5..6a471aba3b07aced498219d4e39498e6d577bfc0 100644 (file)
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -311,7 +311,8 @@ struct pci_dev {
        unsigned int    is_virtfn:1;
        unsigned int    reset_fn:1;
        unsigned int    is_hotplug_bridge:1;
-       unsigned int    aer_firmware_first:1;
+       unsigned int    __aer_firmware_first_valid:1;
+       unsigned int    __aer_firmware_first:1;
        pci_dev_flags_t dev_flags;
        atomic_t        enable_cnt;     /* pci_enable_device has been called */