diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-09-06 07:25:56 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-09-06 07:25:55 -0700 |
| commit | 16527590d2b02fc56e7a4aedb5b343d9a52bce35 (patch) | |
| tree | 1ac82919b34da2e3a645a5213fd6bb0e8364fd24 | |
| parent | b9c3aa30eab90e6f183e160ce1b22f96cb3dafc4 (diff) | |
| parent | bfd8e4b850e2a12e9755566f892ff9c2f6100bf6 (diff) | |
Merge "cnss: comment cnss_msm_pcie_pm_control at GreenHills platform"
| -rw-r--r-- | drivers/net/wireless/cnss/cnss_pci.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/net/wireless/cnss/cnss_pci.c b/drivers/net/wireless/cnss/cnss_pci.c index 2cc69b907def..8de6ff46941f 100644 --- a/drivers/net/wireless/cnss/cnss_pci.c +++ b/drivers/net/wireless/cnss/cnss_pci.c @@ -1526,13 +1526,21 @@ struct pci_saved_state *cnss_pci_store_saved_state(struct pci_dev *dev) return pci_store_saved_state(dev); } +#ifndef CONFIG_GHS_VMM int cnss_msm_pcie_pm_control( enum msm_pcie_pm_opt pm_opt, u32 bus_num, struct pci_dev *pdev, u32 options) { return msm_pcie_pm_control(pm_opt, bus_num, pdev, NULL, options); } - +#else +int cnss_msm_pcie_pm_control( + enum msm_pcie_pm_opt pm_opt, u32 bus_num, + struct pci_dev *pdev, u32 options) +{ + return 0; +} +#endif int cnss_pci_load_and_free_saved_state( struct pci_dev *dev, struct pci_saved_state **state) { |