From patchwork Sat Jun 4 07:31:27 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Grant Likely X-Patchwork-Id: 98714 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 02A45B6FBC for ; Sat, 4 Jun 2011 17:31:54 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753450Ab1FDHba (ORCPT ); Sat, 4 Jun 2011 03:31:30 -0400 Received: from mail-px0-f179.google.com ([209.85.212.179]:50862 "EHLO mail-px0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752206Ab1FDHb3 (ORCPT ); Sat, 4 Jun 2011 03:31:29 -0400 Received: by pxi2 with SMTP id 2so1675917pxi.10 for ; Sat, 04 Jun 2011 00:31:29 -0700 (PDT) Received: by 10.68.38.100 with SMTP id f4mr1164175pbk.126.1307172689216; Sat, 04 Jun 2011 00:31:29 -0700 (PDT) Received: from localhost (S01060002b3d79728.cg.shawcable.net [70.72.87.49]) by mx.google.com with ESMTPS id k9sm2067666pbc.22.2011.06.04.00.31.28 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 04 Jun 2011 00:31:28 -0700 (PDT) Received: from [127.0.1.1] (localhost [127.0.0.1]) by localhost (Postfix) with ESMTP id A9531180D75; Sat, 4 Jun 2011 01:31:27 -0600 (MDT) Subject: [PATCH] net: fix smc91x.c device tree support To: netdev@vger.kernel.org, "David S. Miller" , linux-kernel@vger.kernel.org, Thomas Chou From: Grant Likely Date: Sat, 04 Jun 2011 01:31:27 -0600 Message-ID: <20110604073127.27163.47519.stgit@ponder> User-Agent: StGit/0.15 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fix missing semicolon at end of smc91x.c match tabledevice driver. Also remove unnecessary #ifdef around of_match_table pointer. Signed-off-by: Grant Likely --- drivers/net/smc91x.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c index dc4805f..f628574 100644 --- a/drivers/net/smc91x.c +++ b/drivers/net/smc91x.c @@ -2400,8 +2400,10 @@ static const struct of_device_id smc91x_match[] = { { .compatible = "smsc,lan91c94", }, { .compatible = "smsc,lan91c111", }, {}, -} +}; MODULE_DEVICE_TABLE(of, smc91x_match); +#else +#define smc91x_match NULL #endif static struct dev_pm_ops smc_drv_pm_ops = { @@ -2416,9 +2418,7 @@ static struct platform_driver smc_driver = { .name = CARDNAME, .owner = THIS_MODULE, .pm = &smc_drv_pm_ops, -#ifdef CONFIG_OF .of_match_table = smc91x_match, -#endif }, };