minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-11 13:08:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Nobuhiro Iwamatsu 2007-12-07 01:20:25 +09:00
commit 749ae4c697
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
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

2
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
/* /*