From: seedshope <bocui107@gmail.com>
Date: Sat, 30 Jul 2011 07:28:49 +0000 (+0000)
Subject: ARM: fix error: conflicting types for 'setenv'
X-Git-Tag: v2011.09-rc1~101
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=5589073a16f8927591785a5a9e84edc292476fc1;p=u-boot

ARM: fix error: conflicting types for 'setenv'

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>
---

diff --git a/arch/arm/include/asm/u-boot-arm.h b/arch/arm/include/asm/u-boot-arm.h
index 3904027016..e3fbb53d4d 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);