From mboxrd@z Thu Jan  1 00:00:00 1970
From: Wolfgang Denk <wd@denx.de>
Date: Sun, 02 Sep 2012 17:44:30 +0200
Subject: [U-Boot] [PATCH] input: key_matrix: fix header inclusion
In-Reply-To: <1343940564-31464-1-git-send-email-linz@li-pro.net>
References: <1343940564-31464-1-git-send-email-linz@li-pro.net>
Message-ID: <20120902154430.9F416203B2F@gemini.denx.de>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

Dear Stephan Linz,

In message <1343940564-31464-1-git-send-email-linz@li-pro.net> you 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 <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>
> ---
>  drivers/input/key_matrix.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Yes, it is written.  Good shall always destroy evil.
	-- Sirah the Yang, "The Omega Glory", stardate unknown