From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 19 Aug 2014 14:45:31 +0000 (-0500)
Subject: Merge tag 'pci-v3.17-changes-3' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.17-rc2~29
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f17a6f78595e52761b7b2dece8c11b04b65f19dd;p=platform%2Fkernel%2Flinux-exynos.git

Merge tag 'pci-v3.17-changes-3' of git://git./linux/kernel/git/helgaas/pci

Pull PCI changes from Bjorn Helgaas:
 "Marvell MVEBU
    - Remove ARCH_KIRKWOOD dependency (Andrew Lunn)

  NVIDIA Tegra
    - Add debugfs support (Thierry Reding)

  Synopsys DesignWare
    - Look for configuration space in 'reg', not 'ranges' (Kishon Vijay Abraham I)
    - Program ATU with untranslated address (Kishon Vijay Abraham I)
    - Add config access-related pcie_host_ops for v3.65 hardware (Murali Karicheri)
    - Add MSI-related pcie_host_ops for v3.65 hardware (Murali Karicheri)

  TI DRA7xx
    - Add TI DR7xx PCIe driver (Kishon Vijay Abraham I)"

* tag 'pci-v3.17-changes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  PCI: designware: Add MSI-related pcie_host_ops for v3.65 hardware
  PCI: designware: Add config access-related pcie_host_ops for v3.65 hardware
  PCI: dra7xx: Add TI DRA7xx PCIe driver
  PCI: designware: Program ATU with untranslated address
  PCI: designware: Look for configuration space in 'reg', not 'ranges'
  PCI: tegra: Add debugfs support
  PCI: mvebu: Remove ARCH_KIRKWOOD dependency
---

f17a6f78595e52761b7b2dece8c11b04b65f19dd
diff --cc drivers/pci/host/pci-tegra.c
index abd6578,869a921..0fb0fdb
--- a/drivers/pci/host/pci-tegra.c
+++ b/drivers/pci/host/pci-tegra.c
@@@ -272,10 -273,12 +273,11 @@@ struct tegra_pcie 
  	unsigned int num_ports;
  	u32 xbar_config;
  
 -	struct regulator *pex_clk_supply;
 -	struct regulator *vdd_supply;
 -	struct regulator *avdd_supply;
 +	struct regulator_bulk_data *supplies;
 +	unsigned int num_supplies;
  
  	const struct tegra_pcie_soc_data *soc_data;
+ 	struct dentry *debugfs;
  };
  
  struct tegra_pcie_port {