Patchwork [U-Boot] ARM: fix error: conflicting types for 'setenv'

login
register
mail settings
Submitter Wolfgang Denk
Date July 30, 2011, 10:29 p.m.
Message ID <1312064965-23212-1-git-send-email-wd@denx.de>
Download mbox | patch
Permalink /patch/107519/
State Accepted
Headers show

Comments

Wolfgang Denk - July 30, 2011, 10:29 p.m.
Also remove bogus comment.

Signed-off-by: Zhong hongbo <bocui107@gmail.com>
Changed commit message
Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Albert Aribaud <albert.aribaud@free.fr>
---
 arch/arm/include/asm/u-boot-arm.h |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)
Wolfgang Denk - Aug. 1, 2011, 1:09 p.m.
Dear Albert,

In message <1312064965-23212-1-git-send-email-wd@denx.de> I wrote:
> Also remove bogus comment.
> 
> Signed-off-by: Zhong hongbo <bocui107@gmail.com>
> Changed commit message
> Signed-off-by: Wolfgang Denk <wd@denx.de>
> Cc: Albert Aribaud <albert.aribaud@free.fr>
> ---
>  arch/arm/include/asm/u-boot-arm.h |    8 --------
>  1 files changed, 0 insertions(+), 8 deletions(-)

I applied this directly, it is causing too much trouble to delay it
any longer.

Hope this is OK with you.

Best regards,

Wolfgang Denk

Patch

diff --git a/arch/arm/include/asm/u-boot-arm.h b/arch/arm/include/asm/u-boot-arm.h
index 3904027..e3fbb53 100644
--- a/arch/arm/include/asm/u-boot-arm.h
+++ b/arch/arm/include/asm/u-boot-arm.h
@@ -57,14 +57,6 @@  void	dram_init_banksize (void);
 void	setup_serial_tag (struct tag **params);
 void	setup_revision_tag (struct tag **params);
 
-/* ------------------------------------------------------------ */
-/* Here is a list of some prototypes which are incompatible to	*/
-/* the U-Boot implementation					*/
-/* To be fixed!							*/
-/* ------------------------------------------------------------ */
-/* common/cmd_nvedit.c */
-int	setenv		(char *, char *);
-
 /* cpu/.../interrupt.c */
 int	arch_interrupt_init	(void);
 void	reset_timer_masked	(void);