diff options
author | Jon Loeliger <jdl@freescale.com> | 2007-12-06 11:27:32 -0600 |
---|---|---|
committer | Jon Loeliger <jdl@freescale.com> | 2007-12-06 11:27:32 -0600 |
commit | f743931f9b4d4e15c9bdfe726bef033ea1f1402c (patch) | |
tree | 02c4f32797f779014b5eea46856aa50a98c65dd1 /include/configs | |
parent | 83c5c9b71b451dd62af5dcbddbbe291ee3a58a6e (diff) | |
parent | 41be969f4957115ed7b1fe8b890bfaee99d7a7a2 (diff) | |
download | u-boot-imx-f743931f9b4d4e15c9bdfe726bef033ea1f1402c.zip u-boot-imx-f743931f9b4d4e15c9bdfe726bef033ea1f1402c.tar.gz u-boot-imx-f743931f9b4d4e15c9bdfe726bef033ea1f1402c.tar.bz2 |
Merge commit 'wd/master'
Diffstat (limited to 'include/configs')
-rw-r--r-- | include/configs/ads5121.h | 2 | ||||
-rw-r--r-- | include/configs/sbc2410x.h | 1 | ||||
-rw-r--r-- | include/configs/smdk2410.h | 1 |
3 files changed, 1 insertions, 3 deletions
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 /* diff --git a/include/configs/sbc2410x.h b/include/configs/sbc2410x.h index b4a063a..9b05bd6 100644 --- a/include/configs/sbc2410x.h +++ b/include/configs/sbc2410x.h @@ -103,7 +103,6 @@ #define CONFIG_CMD_DHCP #define CONFIG_CMD_ELF #define CONFIG_CMD_PING -#define CONFIG_CMD_REGINFO #define CONFIG_BOOTDELAY 3 diff --git a/include/configs/smdk2410.h b/include/configs/smdk2410.h index ca404ff..18a036c 100644 --- a/include/configs/smdk2410.h +++ b/include/configs/smdk2410.h @@ -88,7 +88,6 @@ #include <config_cmd_default.h> #define CONFIG_CMD_CACHE -#define CONFIG_CMD_REGINFO #define CONFIG_CMD_DATE #define CONFIG_CMD_ELF |