Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756675Ab2K3NLN (ORCPT ); Fri, 30 Nov 2012 08:11:13 -0500 Received: from mail-ie0-f174.google.com ([209.85.223.174]:61774 "EHLO mail-ie0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751880Ab2K3NLM (ORCPT ); Fri, 30 Nov 2012 08:11:12 -0500 MIME-Version: 1.0 In-Reply-To: <20121130124518.GF26023@gmail.com> References: <2dcd7cb4c4022fa24b5328974e4226f5aaf89419.1354199865.git.viresh.kumar@linaro.org> <121653def4e985b0c1b59045637dd4518f97e73a.1354199865.git.viresh.kumar@linaro.org> <20121130105731.GN3176@sortiz-mobl> <20121130124518.GF26023@gmail.com> Date: Fri, 30 Nov 2012 18:41:11 +0530 Message-ID: Subject: Re: [PATCH V5 2/2] mfd: stmpe: Update DT support in stmpe driver From: Viresh Kumar To: Lee Jones Cc: Samuel Ortiz , grant.likely@secretlab.ca, rabin.vincent@stericsson.com, shiraz.hashim@st.com, devicetree-discuss@lists.ozlabs.org, linux-kernel@vger.kernel.org, spear-devel@list.st.com, linus.walleij@linaro.org, Vipul Kumar Samar Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1687 Lines: 51 On 30 November 2012 18:15, Lee Jones wrote: > The patch doesn't apply for me - does it for you? > > Viresh, what's it based on? Because this was applied 2 days back by Samuel, and i didn't fetch it again yesterday: commit 20d5c7defc228cdaeff3ce3442f3a4e86af293c1 Author: Randy Dunlap Date: Mon Nov 12 09:20:49 2012 -0800 mfd: Fix stmpe.c build when OF is not enabled Fix build errors when CONFIG_OF is not enabled by including (needs to be added in any case). An alternative fix could be to make the driver depend on OF. drivers/mfd/stmpe.c:1025:2: error: implicit declaration of function 'of_property_read_u32' drivers/mfd/stmpe.c:1030:2: error: implicit declaration of function 'for_each_child_of_node' drivers/mfd/stmpe.c:1030:36: error: expected ';' before '{' token Signed-off-by: Randy Dunlap Acked-by: Linus Walleij Signed-off-by: Samuel Ortiz --- drivers/mfd/stmpe.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/mfd/stmpe.c b/drivers/mfd/stmpe.c index 0061d1b..f9f7de7 100644 --- a/drivers/mfd/stmpe.c +++ b/drivers/mfd/stmpe.c @@ -13,6 +13,7 @@ #include #include #include +#include Its a simple conflict to fix, as this is the only place of conflict. -- viresh -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/