From: Ben Hutchings <ben.hutchings@codethink.co.uk>
To: Ben Dooks <ben.dooks@codethink.co.uk>
Cc: kbuild test robot <lkp@intel.com>,
linux-kernel@lists.codethink.co.uk,
linux-arm-kernel@lists.infadead.org,
Ulf Hansson <ulf.hansson@linaro.org>,
linux-mmc@vger.kernel.org, kbuild-all@01.org
Subject: Re: [Linux-kernel] [PATCH] mmc: mmci: add missing include of mmci_qcom_dml.h
Date: Thu, 16 Jun 2016 16:52:08 +0100 [thread overview]
Message-ID: <1466092328.26723.13.camel@codethink.co.uk> (raw)
In-Reply-To: <05d6c5c7-830c-7f00-7ab7-96ed5aa7a44d@codethink.co.uk>
On Thu, 2016-06-16 at 16:17 +0100, Ben Dooks wrote:
> On 14/06/16 14:44, Ben Hutchings wrote:
> > 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@codethink.co.uk>
> >> 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@codethink.co.uk>
> >>
> >> 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.
>
> I'll try and check later, I somehow thought mmci-y and mmci-m wouldn't
> build together.
They won't; that's why you make MMC_QCOM_DML a boolean.
Ben.
--
Ben Hutchings
Software Developer, Codethink Ltd.
prev parent reply other threads:[~2016-06-16 15:52 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-08 18:15 [PATCH] mmc: mmci: add missing include of mmci_qcom_dml.h Ben Dooks
2016-06-09 17:24 ` kbuild test robot
2016-06-09 17:16 ` Ben Dooks
2016-06-09 17:45 ` [Linux-kernel] " Ben Dooks
2016-06-14 13:44 ` Ben Hutchings
2016-06-16 15:17 ` Ben Dooks
2016-06-16 15:52 ` Ben Hutchings [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1466092328.26723.13.camel@codethink.co.uk \
--to=ben.hutchings@codethink.co.uk \
--cc=ben.dooks@codethink.co.uk \
--cc=kbuild-all@01.org \
--cc=linux-arm-kernel@lists.infadead.org \
--cc=linux-kernel@lists.codethink.co.uk \
--cc=linux-mmc@vger.kernel.org \
--cc=lkp@intel.com \
--cc=ulf.hansson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).