From patchwork Wed Jan 15 09:01:29 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 3490811 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E51DAC02DC for ; Wed, 15 Jan 2014 09:05:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A902D201BA for ; Wed, 15 Jan 2014 09:05:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9880A201B9 for ; Wed, 15 Jan 2014 09:05:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751163AbaAOJFw (ORCPT ); Wed, 15 Jan 2014 04:05:52 -0500 Received: from mail-pa0-f44.google.com ([209.85.220.44]:48528 "EHLO mail-pa0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750998AbaAOJFt (ORCPT ); Wed, 15 Jan 2014 04:05:49 -0500 Received: by mail-pa0-f44.google.com with SMTP id kq14so886712pab.3 for ; Wed, 15 Jan 2014 01:05:48 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=41gVEPCtUDQO8CloExB0tUyLoYVrqiu3yWnfzdsPgbE=; b=Y00jvF9qFCh5WI7hMJqqWeIOoR9Z8piCte/xOKInQwas4dFTcy2nit0ljnru5Gd+WV 8GtBplzHrHL0ZSWa/+OO0hQzS0D/k9Fb5pEaSMxrPdTzU+S/mhvBYyt1Es330k3jmhzB kiIW1JDyggvwlGuCNIHoCIa9DI0si7yNL8Smm8qfb5ueZLlL6dzJYWX3lOI6k/XcgdC0 OF7dNth4JNpqaIqVCJMGYDT3UhfF5dgxWwsNEWpooZ2+NJYNaZkCNjtyZacnfqQ/ntRd vMo0bRTurt3D9MUB8WISG1bRLe1kn/tk8J0P9kgykUXd+pQYX0Xki25jWsIohJXt/0vx BFJg== X-Gm-Message-State: ALoCoQmanLltCJ9ykiix2U4SHVpnuYKOFZ77sD3++0IdtU/5iQ6qMeKXvgCBPb3kbx6YmG6mkFr7 X-Received: by 10.66.146.199 with SMTP id te7mr1336171pab.106.1389776748435; Wed, 15 Jan 2014 01:05:48 -0800 (PST) Received: from linaro.sisodomain.com ([115.113.119.130]) by mx.google.com with ESMTPSA id qf7sm8558209pac.14.2014.01.15.01.05.45 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 15 Jan 2014 01:05:47 -0800 (PST) From: Sachin Kamat To: linux-gpio@vger.kernel.org Cc: linux-samsung-soc@vger.kernel.org, linus.walleij@linaro.org, kgene.kim@samsung.com, sachin.kamat@linaro.org, patches@linaro.org Subject: [PATCH 1/1] ARM: S5P[v210|c100|64x0]: Fix build error Date: Wed, 15 Jan 2014 14:31:29 +0530 Message-Id: <1389776489-29853-1-git-send-email-sachin.kamat@linaro.org> X-Mailer: git-send-email 1.7.9.5 Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP gpio-samsung.h header file introduced by commit 93177be0910c ("ARM: S3C[24|64]xx: move includes back under scope") is required only by S3C[24|64]xx machines. Include them conditionally to avoid the following build errors for other machine configurations. drivers/gpio/gpio-samsung.c:35:31: fatal error: mach/gpio-samsung.h: No such file or directory arch/arm/plat-samsung/pm-gpio.c:22:31: fatal error: mach/gpio-samsung.h: No such file or directory Signed-off-by: Sachin Kamat --- Only compile tested. --- arch/arm/plat-samsung/pm-gpio.c | 3 +++ drivers/gpio/gpio-samsung.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/arch/arm/plat-samsung/pm-gpio.c b/arch/arm/plat-samsung/pm-gpio.c index a9f7a37c4173..dd4c15d0d68f 100644 --- a/arch/arm/plat-samsung/pm-gpio.c +++ b/arch/arm/plat-samsung/pm-gpio.c @@ -19,7 +19,10 @@ #include #include +#if defined(CONFIG_ARCH_S3C24XX) || defined(CONFIG_ARCH_S3C64XX) #include +#endif + #include #include diff --git a/drivers/gpio/gpio-samsung.c b/drivers/gpio/gpio-samsung.c index 9741cce11df5..a85e00bf9834 100644 --- a/drivers/gpio/gpio-samsung.c +++ b/drivers/gpio/gpio-samsung.c @@ -32,7 +32,10 @@ #include #include + +#if defined(CONFIG_ARCH_S3C24XX) || defined(CONFIG_ARCH_S3C64XX) #include +#endif #include #include