* [U-Boot] [PATCH] input: key_matrix: fix header inclusion
@ 2012-08-02 20:49 Stephan Linz
2012-08-06 17:56 ` Simon Glass
2012-09-02 15:44 ` Wolfgang Denk
0 siblings, 2 replies; 4+ messages in thread
From: Stephan Linz @ 2012-08-02 20:49 UTC (permalink / raw)
To: u-boot
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(-)
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH] input: key_matrix: fix header inclusion
2012-08-02 20:49 [U-Boot] [PATCH] input: key_matrix: fix header inclusion Stephan Linz
@ 2012-08-06 17:56 ` Simon Glass
2012-08-07 5:04 ` Michal Simek
2012-09-02 15:44 ` Wolfgang Denk
1 sibling, 1 reply; 4+ messages in thread
From: Simon Glass @ 2012-08-06 17:56 UTC (permalink / raw)
To: u-boot
On Thu, Aug 2, 2012 at 1:49 PM, Stephan Linz <linz@li-pro.net> 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>
Acked-by: Simon Glass <sjg@chromium.org>
> ---
> 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
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH] input: key_matrix: fix header inclusion
2012-08-06 17:56 ` Simon Glass
@ 2012-08-07 5:04 ` Michal Simek
0 siblings, 0 replies; 4+ messages in thread
From: Michal Simek @ 2012-08-07 5:04 UTC (permalink / raw)
To: u-boot
On 08/06/2012 07:56 PM, Simon Glass wrote:
> On Thu, Aug 2, 2012 at 1:49 PM, Stephan Linz <linz@li-pro.net> 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>
>
> Acked-by: Simon Glass <sjg@chromium.org>
Acked-by: Michal Simek <monstr@monstr.eu>
Thanks,
Michal
--
Michal Simek, Ing. (M.Eng)
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/
Microblaze U-BOOT custodian
^ permalink raw reply [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH] input: key_matrix: fix header inclusion
2012-08-02 20:49 [U-Boot] [PATCH] input: key_matrix: fix header inclusion Stephan Linz
2012-08-06 17:56 ` Simon Glass
@ 2012-09-02 15:44 ` Wolfgang Denk
1 sibling, 0 replies; 4+ messages in thread
From: Wolfgang Denk @ 2012-09-02 15:44 UTC (permalink / raw)
To: u-boot
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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-09-02 15:44 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-08-02 20:49 [U-Boot] [PATCH] input: key_matrix: fix header inclusion Stephan Linz
2012-08-06 17:56 ` Simon Glass
2012-08-07 5:04 ` Michal Simek
2012-09-02 15:44 ` Wolfgang Denk
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.