Messages in this thread Patch in this message | | | Date | Fri, 30 Nov 2012 18:41:11 +0530 | Subject | Re: [PATCH V5 2/2] mfd: stmpe: Update DT support in stmpe driver | From | Viresh Kumar <> |
| |
On 30 November 2012 18:15, Lee Jones <lee.jones@linaro.org> 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 <rdunlap@infradead.org> 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 <linux/of.h> (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 <rdunlap@infradead.org> Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com> --- 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 <linux/interrupt.h> #include <linux/irq.h> #include <linux/irqdomain.h> +#include <linux/of.h>
Its a simple conflict to fix, as this is the only place of conflict.
-- viresh
| |