From mboxrd@z Thu Jan 1 00:00:00 1970 From: cjb@laptop.org (Chris Ball) Date: Tue, 08 May 2012 10:38:07 -0400 Subject: [PATCH 6.2/7] MMC: mmci: Enable Device Tree support for ux500 In-Reply-To: <4FA918BA.3080303@linaro.org> (Lee Jones's message of "Tue, 08 May 2012 13:59:38 +0100") References: <1334325909-5779-1-git-send-email-lee.jones@linaro.org> <1334325909-5779-7-git-send-email-lee.jones@linaro.org> <4F8BE5B0.4000900@linaro.org> <20120425185747.GC24211@n2100.arm.linux.org.uk> <4FA29E46.6040204@linaro.org> <20120503151253.GE897@n2100.arm.linux.org.uk> <4FA2A4A8.9010208@linaro.org> <20120503163008.GF897@n2100.arm.linux.org.uk> <4FA2B4A3.2040402@linaro.org> <20120503164501.GG897@n2100.arm.linux.org.uk> <8762cdur7o.fsf@laptop.org> <4FA3D720.7010004@linaro.org> <87mx5ot6vp.fsf@laptop.org> <4FA3DC27.6030204@linaro.org> <4FA90127.1050107@linaro.org> <878vh2rhlh.fsf@laptop.org> <4FA918BA.3080303@linaro.org> Message-ID: <874nrqrb5c.fsf@laptop.org> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi, On Tue, May 08 2012, Lee Jones wrote: > Here you go Chris. > > From: Lee Jones > Date: Tue, 8 May 2012 13:40:02 +0100 > Subject: [PATCH] MMC: mmci: Fix compiler error when CONFIG_OF is not set > > error: implicit declaration of function 'mmci_dt_populate_generic_pdata' > > This is due to the '#if CONFIG_OF' guards placed around > mmci_dt_populate_generic_pdata(), but not around the call to it. We > repair this by inserting a stub which elegantly returns when CONFIG_OF > is not set. > > Signed-off-by: Lee Jones > --- > drivers/mmc/host/mmci.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c > index 2303a16..efc822d 100644 > --- a/drivers/mmc/host/mmci.c > +++ b/drivers/mmc/host/mmci.c > @@ -1241,6 +1241,12 @@ static void mmci_dt_populate_generic_pdata(struct device_node *np, > pr_warn("%s: Unsupported bus width\n", np->full_name); > } > } > +#else > +static void mmci_dt_populate_generic_pdata(struct device_node *np, > + struct mmci_platform_data *pdata) > +{ > + return; > +} > #endif > > static int __devinit mmci_probe(struct amba_device *dev, Thanks, this is in mmc-next now. - Chris. -- Chris Ball One Laptop Per Child