summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2008-08-12 20:39:27 +0200
committerStefan Roese <sr@denx.de>2008-08-12 20:39:27 +0200
commit9939ffd5fbf1f5aff4d8172531d4fc33797c62c8 (patch)
tree40e9295368c82a9c7f2b09e7b1fb76c2c44df0ce /Makefile
parent1c7015100a620582224f25eb057573a0fe147648 (diff)
parentcd82919e6c8a73b363a26f34b734923844e52d1c (diff)
downloadu-boot-imx-9939ffd5fbf1f5aff4d8172531d4fc33797c62c8.zip
u-boot-imx-9939ffd5fbf1f5aff4d8172531d4fc33797c62c8.tar.gz
u-boot-imx-9939ffd5fbf1f5aff4d8172531d4fc33797c62c8.tar.bz2
Merge branch 'master' of /home/stefan/git/u-boot/u-boot into next
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 92410ba..217e1c9 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
VERSION = 1
PATCHLEVEL = 3
SUBLEVEL = 4
-EXTRAVERSION = -rc2
+EXTRAVERSION =
U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
VERSION_FILE = $(obj)include/version_autogenerated.h