On Thu, Aug 2, 2012 at 1:49 PM, Stephan Linz <[email protected]> wrote: > 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 <[email protected]> > CC: Bernie Thompson <[email protected]> > CC: Simon Glass <[email protected]> > CC: Tom Warren <[email protected]> > CC: Michal Simek <[email protected]>
Acked-by: Simon Glass <[email protected]> > --- > 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 84b898f..715e57a 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> > -- > 1.7.0.4 > _______________________________________________ U-Boot mailing list [email protected] http://lists.denx.de/mailman/listinfo/u-boot
