summaryrefslogtreecommitdiff
path: root/arch/arm/include
diff options
context:
space:
mode:
authorseedshope <bocui107@gmail.com>2011-07-30 07:28:49 +0000
committerWolfgang Denk <wd@denx.de>2011-08-01 15:07:06 +0200
commit5589073a16f8927591785a5a9e84edc292476fc1 (patch)
tree775e194be826cfd2c870c88d3ebd26dfda7909a5 /arch/arm/include
parent579129398605fbde65b1612ad01d81874ac411ae (diff)
downloadu-boot-imx-5589073a16f8927591785a5a9e84edc292476fc1.zip
u-boot-imx-5589073a16f8927591785a5a9e84edc292476fc1.tar.gz
u-boot-imx-5589073a16f8927591785a5a9e84edc292476fc1.tar.bz2
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>
Diffstat (limited to 'arch/arm/include')
-rw-r--r--arch/arm/include/asm/u-boot-arm.h8
1 files changed, 0 insertions, 8 deletions
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);