From: tomasz.figa@gmail.com (Tomasz Figa)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/2] pinctrl: samsung: Fix link error with CONFIG_PINCTRL_EXYNOS disabled
Date: Wed, 17 Apr 2013 00:24:39 +0200 [thread overview]
Message-ID: <1398545.9FqHoC0WZW@flatron> (raw)
In-Reply-To: <30362001.FF4K7WsZvh@flatron>
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 <tomasz.figa@gmail.com>
---
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);
--
1.8.1.5
next prev parent reply other threads:[~2013-04-16 22:24 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-15 21:14 [PATCH v5 0/6] Initial Device Tree support for S3C64xx Tomasz Figa
2013-04-15 21:14 ` [PATCH v5 1/6] ARM: common: vic: Parse interrupt and resume masks from device tree Tomasz Figa
2013-04-15 21:14 ` [PATCH v5 2/6] ARM: s3c64xx: Skip legacy EINT setup if pinctrl-s3c64xx driver is present Tomasz Figa
2013-04-16 16:26 ` Mark Brown
2013-04-16 22:31 ` Tomasz Figa
2013-04-16 22:43 ` [PATCH v6 " Tomasz Figa
2013-04-15 21:14 ` [PATCH v5 3/6] gpio: samsung: Skip legacy GPIO registration if pinctrl-s3c64xx " Tomasz Figa
2013-04-16 16:27 ` Mark Brown
2013-04-16 22:35 ` Tomasz Figa
2013-04-17 13:06 ` Mark Brown
2013-04-23 14:33 ` Kukjin Kim
2013-04-15 21:14 ` [PATCH v5 4/6] ARM: s3c64xx: Add board file for boot using Device Tree Tomasz Figa
2013-04-15 21:14 ` [PATCH v5 5/6] ARM: dts: Add basic dts include files for Samsung S3C64xx SoCs Tomasz Figa
2013-04-16 13:09 ` Rob Herring
2013-04-16 13:19 ` Tomasz Figa
2013-04-17 17:46 ` Rob Herring
2013-04-23 14:29 ` Kukjin Kim
2013-04-23 14:44 ` Tomasz Figa
2013-04-23 14:48 ` Kukjin Kim
2013-04-15 21:14 ` [PATCH v5 6/6] ARM: dts: Add dts file for S3C6410-based Mini6410 board Tomasz Figa
2013-04-16 16:33 ` [PATCH v5 0/6] Initial Device Tree support for S3C64xx Mark Brown
2013-04-16 22:23 ` [PATCH 1/2] pinctrl: s3c64xx: Fix build error caused by undefined chained_irq_enter Tomasz Figa
2013-04-16 22:24 ` Tomasz Figa [this message]
2013-04-23 12:03 ` [PATCH 2/2] pinctrl: samsung: Fix link error with CONFIG_PINCTRL_EXYNOS disabled Linus Walleij
2013-04-23 12:09 ` Tomasz Figa
2013-04-24 14:27 ` Linus Walleij
2013-04-24 14:47 ` Tomasz Figa
2013-04-25 13:26 ` Linus Walleij
2013-04-16 22:29 ` [PATCH RESEND " Tomasz Figa
2013-04-23 12:00 ` [PATCH 1/2] pinctrl: s3c64xx: Fix build error caused by undefined chained_irq_enter Linus Walleij
2013-04-17 13:08 ` [PATCH v5 0/6] Initial Device Tree support for S3C64xx Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1398545.9FqHoC0WZW@flatron \
--to=tomasz.figa@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).