]> git.sur5r.net Git - u-boot/commitdiff
input: key_matrix: fix header inclusion
authorStephan Linz <linz@li-pro.net>
Thu, 2 Aug 2012 10:49:24 +0000 (10:49 +0000)
committerWolfgang Denk <wd@denx.de>
Sun, 2 Sep 2012 15:44:20 +0000 (17:44 +0200)
On Microblaze with device tree support enabled we run into
the error below.

I'm not sure, but I think that all source code should include
at least the common.h and just this fix the problem on
Microblaz architecture.

The error is:

In file included from key_matrix.c:29:
include/malloc.h:364: error: conflicting types for 'memset'
include/linux/string.h:71: error: previous declaration of 'memset' was here
include/malloc.h:365: error: conflicting types for 'memcpy'
include/linux/string.h:74: error: previous declaration of 'memcpy' was here

Signed-off-by: Stephan Linz <linz@li-pro.net>
CC: Bernie Thompson <bhthompson@chromium.org>
CC: Simon Glass <sjg@chromium.org>
CC: Tom Warren <twarren@nvidia.com>
CC: Michal Simek <monstr@monstr.eu>
Acked-by: Simon Glass <sjg@chromium.org>
Acked-by: Michal Simek <monstr@monstr.eu>
drivers/input/key_matrix.c

index 84b898ff384677d7df5e40443572034626915b51..715e57a2af38157e61938eb5a0dd284f1f4253ce 100644 (file)
@@ -23,6 +23,7 @@
  * MA 02111-1307 USA
  */
 
+#include <common.h>
 #include <fdtdec.h>
 #include <key_matrix.h>
 #include <malloc.h>