diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-10-18 21:59:44 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-10-18 21:59:44 +0200 |
| commit | f82642e33899766892499b163e60560fbbf87773 (patch) | |
| tree | ab90f076f18e56b2b3e8c9375b95917daa78c1d9 /include/dtt.h | |
| parent | b59b16ca24bc7e77ec113021a6d77b9b32fcf192 (diff) | |
| parent | 360fe71e82b83e264c964c9447c537e9a1f643c8 (diff) | |
| download | u-boot-imx-f82642e33899766892499b163e60560fbbf87773.zip u-boot-imx-f82642e33899766892499b163e60560fbbf87773.tar.gz u-boot-imx-f82642e33899766892499b163e60560fbbf87773.tar.bz2 | |
Merge 'next' branch
Conflicts:
board/freescale/mpc8536ds/mpc8536ds.c
include/configs/mgcoge.h
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'include/dtt.h')
| -rw-r--r-- | include/dtt.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/dtt.h b/include/dtt.h index 0c8ee76..399b64a 100644 --- a/include/dtt.h +++ b/include/dtt.h @@ -31,6 +31,7 @@ defined(CONFIG_DTT_ADT7460) || \ defined(CONFIG_DTT_DS1621) || \ defined(CONFIG_DTT_DS1775) || \ + defined(CONFIG_DTT_LM63) || \ defined(CONFIG_DTT_LM73) || \ defined(CONFIG_DTT_LM75) || \ defined(CONFIG_DTT_LM81) @@ -42,12 +43,12 @@ #define DTT_INDUSTRIAL_MAX_TEMP 85 /* -40 - +85 C */ #define DTT_AUTOMOTIVE_MAX_TEMP 105 /* -40 - +105 C */ -#ifndef CFG_DTT_MAX_TEMP -#define CFG_DTT_MAX_TEMP DTT_COMMERCIAL_MAX_TEMP +#ifndef CONFIG_SYS_DTT_MAX_TEMP +#define CONFIG_SYS_DTT_MAX_TEMP DTT_COMMERCIAL_MAX_TEMP #endif -#ifndef CFG_DTT_HYSTERESIS -#define CFG_DTT_HYSTERESIS 5 /* 5 C */ +#ifndef CONFIG_SYS_DTT_HYSTERESIS +#define CONFIG_SYS_DTT_HYSTERESIS 5 /* 5 C */ #endif #endif /* CONFIG_DTT_ADM1021 */ |