diff options
| author | Yaniv Gardi <ygardi@codeaurora.org> | 2014-09-01 17:40:41 +0300 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-22 10:57:20 -0700 |
| commit | 53c3d8d7366a6fd2190530cfe8ec73643f984afa (patch) | |
| tree | e838d951cc674637cf036f801a80dca72417baad | |
| parent | 8c9b78c1e69b8c0e4cc3f1fd89daf57ebf80db3c (diff) | |
defconfig: change SCSI_UFS_MSM to SCSI_UFS_QCOM
Since UFS is not used strictly in a specific set of targets but rather
its code is applicable to MSM, APQ, IPQ etc, "SCSI_UFS_MSM" should be
changed to "SCSI_UFS_QCOM".
Change-Id: I8851907f86055bb5012cb4a00f81511529ba4e03
Signed-off-by: Yaniv Gardi <ygardi@codeaurora.org>
[gbroner@codeaurora.org: fix merge conflicts]
Signed-off-by: Gilad Broner <gbroner@codeaurora.org>
[subhashj@codeaurora.org: resolved merge conflicts, dropped changes to
apq8084_defconfig & msm8994_defconfig files]
Signed-off-by: Subhash Jadavani <subhashj@codeaurora.org>
[venkatg@codeaurora.org: resolved trivial merge conflicts]
Signed-off-by: Venkat Gopalakrishnan <venkatg@codeaurora.org>
| -rw-r--r-- | drivers/scsi/ufs/Makefile | 6 | ||||
| -rw-r--r-- | drivers/scsi/ufs/ufshcd.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/scsi/ufs/Makefile b/drivers/scsi/ufs/Makefile index 855e08f27644..4472d91b05c6 100644 --- a/drivers/scsi/ufs/Makefile +++ b/drivers/scsi/ufs/Makefile @@ -1,8 +1,8 @@ # UFSHCD makefile obj-$(CONFIG_SCSI_UFS_QCOM) += ufs-qcom.o -obj-$(CONFIG_SCSI_UFS_MSM) += ufs-msm-phy.o -obj-$(CONFIG_SCSI_UFS_MSM) += ufs-msm-phy-qmp-28nm.o -obj-$(CONFIG_SCSI_UFS_MSM) += ufs-msm-phy-qmp-20nm.o +obj-$(CONFIG_SCSI_UFS_QCOM) += ufs-msm-phy.o +obj-$(CONFIG_SCSI_UFS_QCOM) += ufs-msm-phy-qmp-28nm.o +obj-$(CONFIG_SCSI_UFS_QCOM) += ufs-msm-phy-qmp-20nm.o obj-$(CONFIG_SCSI_UFSHCD) += ufshcd.o ufs_quirks.o obj-$(CONFIG_SCSI_UFSHCD_PCI) += ufshcd-pci.o obj-$(CONFIG_SCSI_UFSHCD_PLATFORM) += ufshcd-pltfrm.o diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h index 2ec98a1ac571..2e9aa73f2760 100644 --- a/drivers/scsi/ufs/ufshcd.h +++ b/drivers/scsi/ufs/ufshcd.h @@ -778,7 +778,7 @@ int ufshcd_read_device_desc(struct ufs_hba *hba, u8 *buf, u32 size); int ufshcd_read_string_desc(struct ufs_hba *hba, int desc_index, u8 *buf, u32 size, bool ascii); /* variant specific ops structures */ -#ifdef CONFIG_SCSI_UFS_MSM +#ifdef CONFIG_SCSI_UFS_QCOM extern const struct ufs_hba_variant_ops ufs_hba_qcom_vops; #else static const struct ufs_hba_variant_ops ufs_hba_qcom_vops = { |