On Tue, Apr 10, 2012 at 7:33 PM, Chris Ball <cjb@xxxxxxxxxx> wrote: > Hi, > > On Tue, Apr 10 2012, Russell King - ARM Linux wrote: >> This commit: >> >> commit 46856a68dcb5f67c779d211fd6bcb5d7a2a7f19b >> Author: Rajendra Nayak <rnayak@xxxxxx> >> Date: Mon Mar 12 20:32:37 2012 +0530 >> >> mmc: omap_hsmmc: Convert hsmmc driver to use device tree >> >> Define dt bindings for the ti-omap-hsmmc, and adapt the driver to extract >> data (which was earlier passed as platform_data) from device tree. >> >> Signed-off-by: Rajendra Nayak <rnayak@xxxxxx> >> Acked-by: Rob Herring <rob.herring@xxxxxxxxxxx> >> Signed-off-by: Chris Ball <cjb@xxxxxxxxxx> >> >> breaks omap-hsmmc compilation: >> >> drivers/mmc/host/omap_hsmmc.c:1745: error: expected ',' or ';' before 'extern' >> >> +#ifdef CONFIG_OF >> +static u16 omap4_reg_offset = 0x100; >> + >> +static const struct of_device_id omap_mmc_of_match[] = { >> ... >> +} >> +MODULE_DEVICE_TABLE(of, omap_mmc_of_match); >> >> There should be a ';' after the }. > > Thanks, and sorry for breaking the build. I've pushed a fix to mmc-next > and will send it out to Linus. > > Surprisingly, this patch does not break my build with gcc-4.6.0 -- > and I've just checked that line 1745 is being compiled by purposefully > introducing an(other) error to it, which *did* break my build. I wonder > what's going on there; presumably it's the reason that no-one else saw > this earlier. Build fails iff omap_hsmmc is built as a module. Adding ';' fixes and uncovers another build error due to unexported variable allnodes, will send a RFC patch shortly. ERROR: "allnodes" [drivers/mmc/host/omap_hsmmc.ko] undefined! make[3]: *** [__modpost] Error 1 > > - Chris. > -- > Chris Ball <cjb@xxxxxxxxxx> <http://printf.net/> > One Laptop Per Child > -- > To unsubscribe from this list: send the line "unsubscribe linux-omap" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html