Home Explore Help
Register Sign In
phyus
/
uboot-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge git://www.denx.de/git/u-boot

Nobuhiro Iwamatsu 17 years ago
parent
521dcd30b9 41be969f49
commit
749ae4c697
2 changed files with 2 additions and 2 deletions
Unified View Show Diff Stats
  1. 1 1
      Makefile
  2. 1 1
      include/configs/ads5121.h

+ 1 - 1
Makefile
View File 

@@ -24,7 +24,7 @@
 
 VERSION = 1
 
 VERSION = 1
 
 PATCHLEVEL = 3
 
 PATCHLEVEL = 3
 
 SUBLEVEL = 1
 
 SUBLEVEL = 1
 
-EXTRAVERSION = -rc1
 
+EXTRAVERSION =
 
 U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 
 U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 
 VERSION_FILE = $(obj)include/version_autogenerated.h
 
 VERSION_FILE = $(obj)include/version_autogenerated.h

+ 1 - 1
include/configs/ads5121.h
View File 

@@ -231,7 +231,7 @@
 
 #define CFG_I2C_SPEED		100000	/* I2C speed and slave address */
 
 #define CFG_I2C_SPEED		100000	/* I2C speed and slave address */
 
 #define CFG_I2C_SLAVE		0x7F
 
 #define CFG_I2C_SLAVE		0x7F
 
 #if 0
 
 #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
 
 #endif
 
 
 
 /*
 
 /*