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: 2451371 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 6F22C3FD8C for ; Tue, 16 Apr 2013 22:29:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965439Ab3DPW3G (ORCPT ); Tue, 16 Apr 2013 18:29:06 -0400 Received: from mail-ee0-f50.google.com ([74.125.83.50]:47430 "EHLO mail-ee0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965426Ab3DPW3G (ORCPT ); Tue, 16 Apr 2013 18:29:06 -0400 Received: by mail-ee0-f50.google.com with SMTP id e53so476818eek.23 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 Cc: linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree-discuss@lists.ozlabs.org, kgene.kim@samsung.com, kwangwoo.lee@gmail.com, jacmet@sunsite.dk, augulis.darius@gmail.com, mcuelenaere@gmail.com, linux@arm.linux.org.uk, Rob Herring , Mark Rutland , linus.walleij@linaro.org, thomas.abraham@linaro.org 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 Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.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);