diff options
author | Stefan Roese <sr@denx.de> | 2008-07-07 09:51:25 +0200 |
---|---|---|
committer | Stefan Roese <sr@denx.de> | 2008-07-07 09:51:25 +0200 |
commit | 7c6237b3e2f2ee0098897da39b79aff4642b8946 (patch) | |
tree | d768b7851bb688f543da0a3ed50c927a2bde2804 /include/asm-arm/u-boot-arm.h | |
parent | dd1c5523d6f44e842e69f2fcb50788c6060eab86 (diff) | |
parent | c956717ab25c962ef49d49064dfc73f4edcba1fb (diff) | |
download | u-boot-7c6237b3e2f2ee0098897da39b79aff4642b8946.tar.gz u-boot-7c6237b3e2f2ee0098897da39b79aff4642b8946.tar.xz u-boot-7c6237b3e2f2ee0098897da39b79aff4642b8946.zip |
Merge branch 'master' of /home/stefan/git/u-boot/u-boot
Diffstat (limited to 'include/asm-arm/u-boot-arm.h')
-rw-r--r-- | include/asm-arm/u-boot-arm.h | 2 |
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 41e7a8f7d3..4ee5a327e5 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); |