On Mon, Dec 04, 2017 at 02:19:56PM +1100, Stephen Rothwell wrote: > Hi Lee, > > After merging the mfd tree, today's linux-next build (powerpc > allyesconfig) failed like this: > > 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 > > > Caused by commit > > 5da4e04ae480 ("misc: rtsx: Add support for RTS5260") > > I added the following fix patch: > > From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> > Date: Mon, 4 Dec 2017 14:10:34 +1100 > Subject: [PATCH] misc: rtsx: fix symbol clashes > > Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> > --- > drivers/misc/cardreader/rts5260.c | 4 ++-- > drivers/misc/cardreader/rtsx_pcr.c | 4 ++-- > drivers/misc/cardreader/rtsx_pcr.h | 4 ++-- > 3 files changed, 6 insertions(+), 6 deletions(-) Acked-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html