diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-12-04 14:19:56 +1100 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2017-12-04 09:40:38 +0000 |
| commit | 51bd7125f740a1bc9e79cd117d7d50f1dc67a446 (patch) | |
| tree | 8bfa7afa2b93817477ec5454429fbaa5194793c3 /drivers/misc/cardreader/rts5260.c | |
| parent | 5da4e04ae480aac5274dd020af3dfa21935028f7 (diff) | |
| download | op-kernel-dev-51bd7125f740a1bc9e79cd117d7d50f1dc67a446.zip op-kernel-dev-51bd7125f740a1bc9e79cd117d7d50f1dc67a446.tar.gz | |
misc: rtsx: Fix symbol clashes
drivers/staging/rts5208/sd.o: In function `.sd_power_off_card3v3':
(.text+0x5760): multiple definition of `.sd_power_off_card3v3'
drivers/misc/cardreader/rtsx_pcr.o:(.text+0x4630): first defined here
drivers/staging/rts5208/sd.o:(.opd+0x378): multiple definition of `sd_power_off_card3v3'
drivers/misc/cardreader/rtsx_pcr.o:(.opd+0x4f8): first defined here
drivers/staging/rts5208/ms.o: In function `.ms_power_off_card3v3':
(.text+0x5e70): multiple definition of `.ms_power_off_card3v3'
drivers/misc/cardreader/rtsx_pcr.o:(.text+0x46e0): first defined here
drivers/staging/rts5208/ms.o:(.opd+0x360): multiple definition of `ms_power_off_card3v3'
drivers/misc/cardreader/rtsx_pcr.o:(.opd+0x510): first defined here
Fixes: 5da4e04ae480 ("misc: rtsx: Add support for RTS5260")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/misc/cardreader/rts5260.c')
| -rw-r--r-- | drivers/misc/cardreader/rts5260.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/misc/cardreader/rts5260.c b/drivers/misc/cardreader/rts5260.c index 3b30864..07cb93a 100644 --- a/drivers/misc/cardreader/rts5260.c +++ b/drivers/misc/cardreader/rts5260.c @@ -426,9 +426,9 @@ void rts5260_process_ocp(struct rtsx_pcr *pcr) rtsx_pci_get_ocpstat(pcr, &pcr->ocp_stat); rts5260_get_ocpstat2(pcr, &pcr->ocp_stat2); if (pcr->card_exist & SD_EXIST) - sd_power_off_card3v3(pcr); + rtsx_sd_power_off_card3v3(pcr); else if (pcr->card_exist & MS_EXIST) - ms_power_off_card3v3(pcr); + rtsx_ms_power_off_card3v3(pcr); if (!(pcr->card_exist & MS_EXIST) && !(pcr->card_exist & SD_EXIST)) { if ((pcr->ocp_stat & (SD_OC_NOW | SD_OC_EVER | |
