[PATCH v2] davinci_nand: fix modular build with CONFIG_OF=y

Heiko Schocher hs at denx.de
Fri Jan 4 01:40:09 EST 2013


Hello Sergei

On 03.01.2013 19:27, Sergei Shtylyov wrote:
> Commit cdeadd712f52b16a9285386d61ee26fd14eb4085 (mtd: nand: davinci: add OF
> support for davinci nand controller) has never been really build tested with
> the driver as a module.  When the driver is built-in, the missing semicolon
> after structure initializer is "compensated" by MODULE_DEVICE_TABLE() macro
> being empty and so the initializer using the trailing semicolon on the next
> line; when the driver is built as a module, compilation error ensues, and as
> the 'davinci_all_defconfig' has the NAND driver modular, this error prevents
> DaVinci family kernel from building...
>
> Signed-off-by: Sergei Shtylyov<sshtylyov at ru.mvista.com>
> Cc: stable at vger.kernel.org # 3.7
>
> ---
> The patch is atop of the recent Linus' tree.
> Sekhar, have you build tested at least 3.8-rc1?
>
>   drivers/mtd/nand/davinci_nand.c |    2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> Index: linux/drivers/mtd/nand/davinci_nand.c
> ===================================================================
> --- linux.orig/drivers/mtd/nand/davinci_nand.c
> +++ linux/drivers/mtd/nand/davinci_nand.c
> @@ -523,7 +523,7 @@ static struct nand_ecclayout hwecc4_2048
>   static const struct of_device_id davinci_nand_of_match[] = {
>   	{.compatible = "ti,davinci-nand", },
>   	{},
> -}
> +};
>   MODULE_DEVICE_TABLE(of, davinci_nand_of_match);
>
>   static struct davinci_nand_pdata

Acked-by: Heiko Schocher <hs at denx.de>

Thanks for detecting this!

bye,
Heiko
-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany



More information about the linux-mtd mailing list