diff --git a/[refs] b/[refs] index f4d5be4966c4..2165b6db115d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9958610552c0bd7558b41cb8addbd865587f142a +refs/heads/master: 6d3be84aab461815978d970aa45f5bc9e52dd772 diff --git a/trunk/include/linux/pci.h b/trunk/include/linux/pci.h index f0c056780a1f..578a0770961a 100644 --- a/trunk/include/linux/pci.h +++ b/trunk/include/linux/pci.h @@ -302,7 +302,8 @@ struct pci_dev { unsigned int msix_enabled:1; unsigned int ari_enabled:1; /* ARI forwarding */ unsigned int is_managed:1; - unsigned int is_pcie:1; + unsigned int is_pcie:1; /* Obsolete. Will be removed. + Use pci_is_pcie() instead */ unsigned int needs_freset:1; /* Dev requires fundamental reset */ unsigned int state_saved:1; unsigned int is_physfn:1;