From patchwork Wed Jan 2 20:22:27 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Shtylyov X-Patchwork-Id: 1924811 Return-Path: X-Original-To: patchwork-davinci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from comal.ext.ti.com (comal.ext.ti.com [198.47.26.152]) by patchwork1.kernel.org (Postfix) with ESMTP id CEB8A3FC85 for ; Wed, 2 Jan 2013 19:27:53 +0000 (UTC) Received: from dlelxv30.itg.ti.com ([172.17.2.17]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id r02JNt2e020914; Wed, 2 Jan 2013 13:23:55 -0600 Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110]) by dlelxv30.itg.ti.com (8.13.8/8.13.8) with ESMTP id r02JNtp5016162; Wed, 2 Jan 2013 13:23:55 -0600 Received: from dlelxv23.itg.ti.com (172.17.1.198) by dfle73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.1.323.3; Wed, 2 Jan 2013 13:23:54 -0600 Received: from linux.omap.com (dlelxs01.itg.ti.com [157.170.227.31]) by dlelxv23.itg.ti.com (8.13.8/8.13.8) with ESMTP id r02JNsWV028257; Wed, 2 Jan 2013 13:23:54 -0600 Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id 1EEB880627; Wed, 2 Jan 2013 13:23:54 -0600 (CST) X-Original-To: davinci-linux-open-source@linux.davincidsp.com Delivered-To: davinci-linux-open-source@linux.davincidsp.com Received: from dflp52.itg.ti.com (dflp52.itg.ti.com [128.247.22.96]) by linux.omap.com (Postfix) with ESMTP id 49FFD80626 for ; Wed, 2 Jan 2013 13:23:52 -0600 (CST) Received: from white.ext.ti.com (white.ext.ti.com [192.94.93.38]) by dflp52.itg.ti.com (8.13.7/8.13.8) with ESMTP id r02JNqTg006753 for ; Wed, 2 Jan 2013 13:23:52 -0600 (CST) Received: from psmtp.com (na3sys009amx166.postini.com [74.125.149.92]) by white.ext.ti.com (8.13.7/8.13.7) with SMTP id r02JNocl008445 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Wed, 2 Jan 2013 13:23:50 -0600 Received: from wasted.dev.rtsoft.ru ([213.79.90.226]) (using TLSv1) by na3sys009amx166.postini.com ([74.125.148.10]) with SMTP; Wed, 02 Jan 2013 14:23:50 EST Received: from wasted.dev.rtsoft.ru (localhost.localdomain [127.0.0.1]) by wasted.dev.rtsoft.ru (8.14.4/8.14.4) with ESMTP id r02KMTIk007754; Wed, 2 Jan 2013 23:22:29 +0300 Received: (from headless@localhost) by wasted.dev.rtsoft.ru (8.14.4/8.14.4/Submit) id r02KMR0B007752; Wed, 2 Jan 2013 23:22:27 +0300 X-Authentication-Warning: wasted.dev.rtsoft.ru: headless set sender to sshtylyov@ru.mvista.com using -f To: , Subject: [PATCH] davinci_nand: fix compilation with CONFIG_OF=y From: Sergei Shtylyov Organization: MontaVista Software LLC Date: Wed, 2 Jan 2013 23:22:27 +0300 MIME-Version: 1.0 Message-ID: <201301022322.27541.sshtylyov@ru.mvista.com> X-pstn-levels: (S:99.90000/99.90000 CV:99.9000 FC:95.5390 LC:95.5390 R:95.9108 P:95.9108 M:97.0282 C:98.6951 ) X-pstn-dkim: 0 skipped:no-policies X-pstn-settings: 2 (0.5000:0.5000) s cv gt3 gt2 gt1 r p m c X-pstn-addresses: from [82/3] CC: , X-BeenThere: davinci-linux-open-source@linux.davincidsp.com X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: Errors-To: davinci-linux-open-source-bounces@linux.davincidsp.com 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 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(-) 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