On Thu, 2016-06-09 at 18:45 +0100, Ben Dooks wrote: [...] > After looking at the build, it looks like this is broken > for the case of building mmci as a module. I think this is > the right fix. > > commit be3bf8f3b56d9cfb2fcba88e638ec853d0484cbb > Author: Ben Dooks <ben.dooks@xxxxxxxxxxxxxxx> > Date: Thu Jun 9 18:42:53 2016 +0100 > > mmci: fixup module build with new mmci_qcom_dml > > Fix the module build for the mmci code if it is built as > a module and the MMC_QCOM_DML option is also set. If so > then we need to build a composite module of the two files > to ensure they link properly. > > Signed-off-by: Ben Dooks <ben.dooks@xxxxxxxxxxxxxxx> > > diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile > index af918d2..b57db76 100644 > --- a/drivers/mmc/host/Makefile > +++ b/drivers/mmc/host/Makefile > @@ -3,7 +3,8 @@ > # > > obj-$(CONFIG_MMC_ARMMMCI) += mmci.o > -obj-$(CONFIG_MMC_QCOM_DML) += mmci_qcom_dml.o > +mmci-y += mmci_core.o > +mmci-$(subst m,y,$(CONFIG_MMC_QCOM_DML)) += mmci_qcom_dml.o [...] If mmci_core.o and mmci_qcom_dml.o will always be linked together then MMC_QCOM_DML should be a boolean and you don't need any substitution here. Ben. -- Ben Hutchings Software Developer, Codethink Ltd. -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
