diff options
| author | Stephan Linz <linz@li-pro.net> | 2012-08-02 10:49:24 +0000 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2012-09-02 17:44:20 +0200 |
| commit | c20dbf64a976a40d39694a991d3bf51985cb35f6 (patch) | |
| tree | 14919692c4f9208af8129d95950f3fa89814a837 /drivers/input | |
| parent | 8a156fb6e43208e77dd9a8b6265e491bc7814950 (diff) | |
| download | talos-obmc-uboot-c20dbf64a976a40d39694a991d3bf51985cb35f6.tar.gz talos-obmc-uboot-c20dbf64a976a40d39694a991d3bf51985cb35f6.zip | |
input: key_matrix: fix header inclusion
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>
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/key_matrix.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/key_matrix.c b/drivers/input/key_matrix.c index 84b898ff38..715e57a2af 100644 --- a/drivers/input/key_matrix.c +++ b/drivers/input/key_matrix.c @@ -23,6 +23,7 @@ * MA 02111-1307 USA */ +#include <common.h> #include <fdtdec.h> #include <key_matrix.h> #include <malloc.h> |
