Patchwork davinci_nand: fix compilation with CONFIG_OF=y

login
register
mail settings
Submitter Sergei Shtylyov
Date Jan. 2, 2013, 8:22 p.m.
Message ID <201301022322.27541.sshtylyov@ru.mvista.com>
Download mbox | patch
Permalink /patch/209135/
State Accepted
Commit 7a9c83888761a9a26049b439dc0b09e7ea8a854b
Headers show

Comments

Sergei Shtylyov - Jan. 2, 2013, 8:22 p.m.
Commit cdeadd712f52b16a9285386d61ee26fd14eb4085 (mtd: nand: davinci: add OF
support for davinci nand controller) obviously has never been really build
tested with CONFIG_OF=y.  Now it prevents DaVinci family kernels from building:
all due to stupidly missing semicolon after a structure initializer...

Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Cc: stable@vger.kernel.org # 3.7

---
Sekhar, have you build tested at least 3.8-rc1?


 drivers/mtd/nand/davinci_nand.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Artem Bityutskiy - Jan. 15, 2013, 2:56 p.m.
On Wed, 2013-01-02 at 23:22 +0300, Sergei Shtylyov wrote:
> Commit cdeadd712f52b16a9285386d61ee26fd14eb4085 (mtd: nand: davinci: add OF
> support for davinci nand controller) obviously has never been really build
> tested with CONFIG_OF=y.  Now it prevents DaVinci family kernels from building:
> all due to stupidly missing semicolon after a structure initializer...
> 
> Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
> Cc: stable@vger.kernel.org # 3.7

This patch is currently sitting in the mtd tree, and I believe will be
merged to 3.8.

Patch

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