diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2013-02-15 17:44:19 -0700 | 
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-02-15 17:44:19 -0700 | 
| commit | fd5e20bcb465e8d69a6fda617a7b35fb5f8d4eb1 (patch) | |
| tree | 8d54af1fb3aea5beb65582eb1a6626bc3563806a | |
| parent | ad06bff31fbf0aba4e5faae936e12292a7972b05 (diff) | |
| parent | 969daa349f4821a02936af7202b51a9affc7b6da (diff) | |
| download | olio-linux-3.10-fd5e20bcb465e8d69a6fda617a7b35fb5f8d4eb1.tar.xz olio-linux-3.10-fd5e20bcb465e8d69a6fda617a7b35fb5f8d4eb1.zip  | |
Merge branch 'pci/misc' into next
* pci/misc:
  PCI: Fix PCI Express Capability accessors for PCI_EXP_FLAGS
| -rw-r--r-- | drivers/pci/access.c | 2 | 
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/access.c b/drivers/pci/access.c index 5278ac692cb..1cc23661f79 100644 --- a/drivers/pci/access.c +++ b/drivers/pci/access.c @@ -515,7 +515,7 @@ static bool pcie_capability_reg_implemented(struct pci_dev *dev, int pos)  		return false;  	switch (pos) { -	case PCI_EXP_FLAGS_TYPE: +	case PCI_EXP_FLAGS:  		return true;  	case PCI_EXP_DEVCAP:  	case PCI_EXP_DEVCTL:  |