summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNobuhiro Iwamatsu <iwamatsu@nigauri.org>2007-12-07 01:20:25 +0900
committerNobuhiro Iwamatsu <iwamatsu@nigauri.org>2007-12-07 01:20:25 +0900
commit749ae4c6970549321895de744fb5ac6d383c1b46 (patch)
tree251b626771d7903261dad305cc8929aa44ce73cb
parent521dcd30b9cc5b72cd27ae04104f19369251aa20 (diff)
parent41be969f4957115ed7b1fe8b890bfaee99d7a7a2 (diff)
downloadu-boot-imx-749ae4c6970549321895de744fb5ac6d383c1b46.zip
u-boot-imx-749ae4c6970549321895de744fb5ac6d383c1b46.tar.gz
u-boot-imx-749ae4c6970549321895de744fb5ac6d383c1b46.tar.bz2
Merge git://www.denx.de/git/u-boot
-rw-r--r--Makefile2
-rw-r--r--include/configs/ads5121.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 76f35a4..b32bd3b 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
VERSION = 1
PATCHLEVEL = 3
SUBLEVEL = 1
-EXTRAVERSION = -rc1
+EXTRAVERSION =
U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
VERSION_FILE = $(obj)include/version_autogenerated.h
diff --git a/include/configs/ads5121.h b/include/configs/ads5121.h
index bb1efdf..58060a8 100644
--- a/include/configs/ads5121.h
+++ b/include/configs/ads5121.h
@@ -231,7 +231,7 @@
#define CFG_I2C_SPEED 100000 /* I2C speed and slave address */
#define CFG_I2C_SLAVE 0x7F
#if 0
-#define CFG_I2C_NOPROBES {{0,0x69}} * Don't probe these addrs */
+#define CFG_I2C_NOPROBES {{0,0x69}} /* Don't probe these addrs */
#endif
/*