From patchwork Tue Apr 16 22:29:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Figa X-Patchwork-Id: 2451381 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) by patchwork1.kernel.org (Postfix) with ESMTP id A552E3FD8C for ; Tue, 16 Apr 2013 22:29:13 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1USEND-00023H-UO; Tue, 16 Apr 2013 22:29:12 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1USENB-0000Or-Ae; Tue, 16 Apr 2013 22:29:09 +0000 Received: from mail-ee0-f47.google.com ([74.125.83.47]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1USEN8-0000OM-1o for linux-arm-kernel@lists.infradead.org; Tue, 16 Apr 2013 22:29:07 +0000 Received: by mail-ee0-f47.google.com with SMTP id t10so458967eei.20 for ; Tue, 16 Apr 2013 15:29:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:user-agent :in-reply-to:references:mime-version:content-transfer-encoding :content-type; bh=kHsHhp2DUCxtCJutlUPGCsyN4hIqJGxDEUwj2wrv67s=; b=XkAI64zGJOkYXKs3gXBW/nh0/UsH40y0yusCkSZrMPAjPmqWLeKZtD6wc9g1NxZgdR n2YE4aZwwQQfVsCTwyD0jzu36lNb7MHak6gerSd1MKvQr2MK2H8XCxchC+cFM29iS1FX imVfPXTojpqYWxNFjFTe/rG7daglYsJaMsKwrWIrbn7lkJ852FsodEBLiK+qrj09lzYz pL2UmUsGREe7RkXhPC4uackgGZ/5DbeIXYLBFLICHiP3f+DLMe3GZp+gRUHQbkp0HD6v pbtywLwz+dqTa2Cb/cSO7Jfwg10fG9XWzYxU2jOgGPDYzEG48/6eAlshWxczgXcPtN2P /f4A== X-Received: by 10.15.102.3 with SMTP id bq3mr11003965eeb.42.1366151344092; Tue, 16 Apr 2013 15:29:04 -0700 (PDT) Received: from flatron.localnet (87-207-52-162.dynamic.chello.pl. [87.207.52.162]) by mx.google.com with ESMTPS id s47sm5215157eeg.8.2013.04.16.15.29.01 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 16 Apr 2013 15:29:03 -0700 (PDT) From: Tomasz Figa To: Mark Brown Subject: [PATCH RESEND 2/2] pinctrl: samsung: Fix link error with CONFIG_PINCTRL_EXYNOS disabled Date: Wed, 17 Apr 2013 00:29:05 +0200 Message-ID: <2934745.t3ZR6H9zHp@flatron> User-Agent: KMail/4.10.2 (Linux/3.8.7-gentoo; KDE/4.10.2; x86_64; ; ) In-Reply-To: <30362001.FF4K7WsZvh@flatron> References: <1366060483-20342-1-git-send-email-tomasz.figa@gmail.com> <20130416163331.GP26958@opensource.wolfsonmicro.com> <30362001.FF4K7WsZvh@flatron> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130416_182906_265373_AE088713 X-CRM114-Status: GOOD ( 12.09 ) X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (tomasz.figa[at]gmail.com) -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [74.125.83.47 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: Mark Rutland , kgene.kim@samsung.com, linux@arm.linux.org.uk, kwangwoo.lee@gmail.com, thomas.abraham@linaro.org, devicetree-discuss@lists.ozlabs.org, mcuelenaere@gmail.com, linux-samsung-soc@vger.kernel.org, augulis.darius@gmail.com, jacmet@sunsite.dk, linus.walleij@linaro.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Commit f67faf487 added driver data for Exynos5250, which is available only if CONFIG_PINCTRL_EXYNOS is enabled. However probably due to merge error, the reference to this driver data structure was located outside of relevant ifdef and compiled unconditionally, leading to link error with CONFIG_PINCTRL_EXYNOS. This patch fixes mentioned link error by moving driver data entry under ifdef CONFIG_PINCTRL_EXYNOS. Signed-off-by: Tomasz Figa --- drivers/pinctrl/pinctrl-samsung.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/pinctrl/pinctrl-samsung.c b/drivers/pinctrl/pinctrl-samsung.c index f95dd69..9763668 100644 --- a/drivers/pinctrl/pinctrl-samsung.c +++ b/drivers/pinctrl/pinctrl-samsung.c @@ -970,13 +970,13 @@ static const struct of_device_id samsung_pinctrl_dt_match[] = { .data = (void *)exynos4210_pin_ctrl }, { .compatible = "samsung,exynos4x12-pinctrl", .data = (void *)exynos4x12_pin_ctrl }, + { .compatible = "samsung,exynos5250-pinctrl", + .data = (void *)exynos5250_pin_ctrl }, #endif #ifdef CONFIG_PINCTRL_S3C64XX { .compatible = "samsung,s3c64xx-pinctrl", .data = s3c64xx_pin_ctrl }, #endif - { .compatible = "samsung,exynos5250-pinctrl", - .data = (void *)exynos5250_pin_ctrl }, {}, }; MODULE_DEVICE_TABLE(of, samsung_pinctrl_dt_match);