On Tuesday 26 May 2015 00:04:19 Alexandre Belloni wrote: > index b327e5cc8de3..4fa7ac91f972 100644 > --- a/sound/soc/atmel/Makefile > +++ b/sound/soc/atmel/Makefile > @@ -1,10 +1,8 @@ > # AT91 Platform Support > -snd-soc-atmel-pcm-pdc-objs := atmel-pcm-pdc.o > -snd-soc-atmel-pcm-dma-objs := atmel-pcm-dma.o > -snd-soc-atmel_ssc_dai-objs := atmel_ssc_dai.o > +snd-soc-atmel-pcm-$(CONFIG_SND_ATMEL_SOC_PDC) := atmel-pcm-pdc.o > +snd-soc-atmel-pcm-$(CONFIG_SND_ATMEL_SOC_DMA) += atmel-pcm-dma.o > +snd-soc-atmel_ssc_dai-objs := atmel_ssc_dai.o $(snd-soc-atmel-pcm-y)
While technically correct, you could have written this (slightly) simpler as: snd-soc-atmel_ssc_dai-objs := atmel_ssc_dai.o snd-soc-atmel-ssc_dai-$(CONFIG_SND_ATMEL_SOC_PDC) += atmel-pcm-pdc.o snd-soc-atmel-ssc_dai-$(CONFIG_SND_ATMEL_SOC_DMA) += atmel-pcm-dma.o No need to change the patch again after it's applied now. Arnd -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/