summaryrefslogtreecommitdiff
path: root/include/asm-arm/u-boot-arm.h
diff options
context:
space:
mode:
authorJon Loeliger <jdl@freescale.com>2008-07-10 12:05:32 -0500
committerJon Loeliger <jdl@freescale.com>2008-07-10 12:05:32 -0500
commit859f24350e6e4313626f85161dd03f025a4dac59 (patch)
treea025f68619045556e662326c8e1cbc147f9b633e /include/asm-arm/u-boot-arm.h
parent3473ab737282b08ad61841fcbb14c4d264a93a8e (diff)
parente0320b1ebec13755911a53b0af12cbf3e5e49a65 (diff)
downloadu-boot-imx-859f24350e6e4313626f85161dd03f025a4dac59.zip
u-boot-imx-859f24350e6e4313626f85161dd03f025a4dac59.tar.gz
u-boot-imx-859f24350e6e4313626f85161dd03f025a4dac59.tar.bz2
Merge commit 'wd/master'
Diffstat (limited to 'include/asm-arm/u-boot-arm.h')
-rw-r--r--include/asm-arm/u-boot-arm.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/u-boot-arm.h b/include/asm-arm/u-boot-arm.h
index 41e7a8f..4ee5a32 100644
--- a/include/asm-arm/u-boot-arm.h
+++ b/include/asm-arm/u-boot-arm.h
@@ -52,7 +52,7 @@ void setup_revision_tag (struct tag **params);
/* To be fixed! */
/* ------------------------------------------------------------ */
/* common/cmd_nvedit.c */
-void setenv (char *, char *);
+int setenv (char *, char *);
/* cpu/.../interrupt.c */
void reset_timer_masked (void);