diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-12-04 04:19:56 +0100 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2017-12-04 10:40:38 +0100 |
| commit | 51bd7125f740a1bc9e79cd117d7d50f1dc67a446 (patch) | |
| tree | 8bfa7afa2b93817477ec5454429fbaa5194793c3 /drivers/misc/cardreader/rtsx_pcr.h | |
| parent | misc: rtsx: Add support for RTS5260 (diff) | |
| download | linux-51bd7125f740a1bc9e79cd117d7d50f1dc67a446.tar.xz linux-51bd7125f740a1bc9e79cd117d7d50f1dc67a446.zip | |
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/rtsx_pcr.h')
| -rw-r--r-- | drivers/misc/cardreader/rtsx_pcr.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/misc/cardreader/rtsx_pcr.h b/drivers/misc/cardreader/rtsx_pcr.h index c544e35d0154..6ea1655db0bb 100644 --- a/drivers/misc/cardreader/rtsx_pcr.h +++ b/drivers/misc/cardreader/rtsx_pcr.h @@ -107,7 +107,7 @@ void rtsx_pci_disable_ocp(struct rtsx_pcr *pcr); void rtsx_pci_enable_ocp(struct rtsx_pcr *pcr); int rtsx_pci_get_ocpstat(struct rtsx_pcr *pcr, u8 *val); void rtsx_pci_clear_ocpstat(struct rtsx_pcr *pcr); -int sd_power_off_card3v3(struct rtsx_pcr *pcr); -int ms_power_off_card3v3(struct rtsx_pcr *pcr); +int rtsx_sd_power_off_card3v3(struct rtsx_pcr *pcr); +int rtsx_ms_power_off_card3v3(struct rtsx_pcr *pcr); #endif |