summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-06-30 00:59:21 +0200
committerWolfgang Denk <wd@denx.de>2010-06-30 00:59:21 +0200
commitbde3892edac99bf974e5b9809a112a6ce530be03 (patch)
treed95879d513876d874e320b42c3dd32d6d3d02f35 /Makefile
parenta8e2b04417b802a9baf86de9c2e06375135e666f (diff)
parenta59e27997637a2395ae2cc7f809127f24119a167 (diff)
downloadu-boot-imx-bde3892edac99bf974e5b9809a112a6ce530be03.zip
u-boot-imx-bde3892edac99bf974e5b9809a112a6ce530be03.tar.gz
u-boot-imx-bde3892edac99bf974e5b9809a112a6ce530be03.tar.bz2
Merge branch 'master' of /home/wd/git/u-boot/work
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 87d5214..d7a6921 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
VERSION = 2010
PATCHLEVEL = 06
SUBLEVEL =
-EXTRAVERSION = -rc3
+EXTRAVERSION =
ifneq "$(SUBLEVEL)" ""
U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
else