From patchwork Wed Jun 26 16:39:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bartlomiej Zolnierkiewicz X-Patchwork-Id: 2787271 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 E33C8C0AB1 for ; Wed, 26 Jun 2013 16:40:04 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A706F205C4 for ; Wed, 26 Jun 2013 16:40:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E4DC7205C1 for ; Wed, 26 Jun 2013 16:40:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751557Ab3FZQkB (ORCPT ); Wed, 26 Jun 2013 12:40:01 -0400 Received: from mailout2.samsung.com ([203.254.224.25]:16982 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751498Ab3FZQkA convert rfc822-to-8bit (ORCPT ); Wed, 26 Jun 2013 12:40:00 -0400 Received: from epcpsbgm2.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MP0004MGEANYW50@mailout2.samsung.com> for linux-samsung-soc@vger.kernel.org; Thu, 27 Jun 2013 01:39:59 +0900 (KST) X-AuditID: cbfee61b-b7f8e6d00000524c-e4-51cb195e2f64 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 20.FF.21068.E591BC15; Thu, 27 Jun 2013 01:39:58 +0900 (KST) Received: from amdc1032.localnet ([106.116.147.136]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MP000LTWEAGNRA0@mmp1.samsung.com>; Thu, 27 Jun 2013 01:39:58 +0900 (KST) From: Bartlomiej Zolnierkiewicz To: Stephen Rothwell Cc: Tomasz Figa , Kukjin Kim , Kyungmin Park , linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Subject: [linux-next PATCH] samsung_pwm: fix build for CONFIG_CLKSRC_SAMSUNG_PWM=n Date: Wed, 26 Jun 2013 18:39:49 +0200 Message-id: <1913259.iCGtCKZW7f@amdc1032> User-Agent: KMail/4.8.4 (Linux/3.5.0-rc2+; KDE/4.8.5; i686; ; ) MIME-version: 1.0 Content-transfer-encoding: 8BIT Content-type: text/plain; charset=utf-8 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrJLMWRmVeSWpSXmKPExsVy+t9jAd04ydOBBju22Vj0LrjKZnG26Q27 xabH11gtZpzfx2Sxde9VdotVu/4wOrB5NN64weaxc9Zddo/NS+o9+rasYvT4vEkugDWKyyYl NSezLLVI3y6BK2P//YvsBet4KlZc7mJuYPzM1cXIySEhYCLxYkMrI4QtJnHh3no2EFtIYBGj xOzd/BB2C5PErieOIDabgJXExPZVQPUcHCIC2hIHfgt0MXJxMAscZpSYuKeRFaRGWCBE4sSS C2wgNSwCqhJXj1eBhHkFNCVeXpgLtkpUwF5i27u3bBBxQYkfk++xgNjMQCOfvLvACtLKLKAu MWVK7gRGvllIqmYhqZqFULWAkXkVo2hqQXJBcVJ6rpFecWJucWleul5yfu4mRnCAPpPewbiq weIQowAHoxIP7wfG04FCrIllxZW5hxglOJiVRHjfiQCFeFMSK6tSi/Lji0pzUosPMUpzsCiJ 8x5stQ4UEkhPLEnNTk0tSC2CyTJxcEo1MHr6nyn/xre1gI/V7urKbL/kY1tn5X0Xufmi529D XFfS1FN6hjs+2SjwBeTNlz38foPSgt9KSyW25W/vPNP4f8aeNzqPWOrrzRrELW6zfr5qoNdm EJPbdPh53PzcojccoQlGEnsTF7R2SfTde2B+pcIytFL97e2GmTL5hqUpGg9vFjaseJ2YqMRS nJFoqMVcVJwIAPJ2UT5MAgAA 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=-8.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 From: Bartlomiej Zolnierkiewicz Subject: [linux-next PATCH] samsung_pwm: fix build for CONFIG_CLKSRC_SAMSUNG_PWM=n If CONFIG_PWM_SAMSUNG=y and CONFIG_CLKSRC_SAMSUNG_PWM=n next-20130626 build fails with the following error: drivers/pwm/pwm-samsung.c:89:19: error: static declaration of ‘samsung_pwm_lock’ follows non-static declaration include/clocksource/samsung_pwm.h:23:19: note: previous declaration of ‘samsung_pwm_lock’ was here It is caused by commit 9ebe293 ("pwm: Add new pwm-samsung driver"). Fix it by adding missing ifdef. Cc: Stephen Rothwell Cc: Tomasz Figa Cc: Kukjin Kim Signed-off-by: Kyungmin Park Signed-off-by: Bartlomiej Zolnierkiewicz --- include/clocksource/samsung_pwm.h | 2 ++ 1 file changed, 2 insertions(+) -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: b/include/clocksource/samsung_pwm.h =================================================================== --- a/include/clocksource/samsung_pwm.h 2013-06-21 12:05:51.329680497 +0200 +++ b/include/clocksource/samsung_pwm.h 2013-06-26 17:48:02.574187287 +0200 @@ -20,7 +20,9 @@ #define SAMSUNG_PWM_NUM 5 +#ifdef CONFIG_CLKSRC_SAMSUNG_PWM extern spinlock_t samsung_pwm_lock; +#endif struct samsung_pwm_variant { u8 bits;