diff options
| author | Markus Klotzbuecher <mk@denx.de> | 2008-10-21 09:18:01 +0200 |
|---|---|---|
| committer | Markus Klotzbuecher <mk@denx.de> | 2008-10-21 09:18:01 +0200 |
| commit | 50bd0057ba8fceeb48533f8b1a652ccd0e170838 (patch) | |
| tree | ea1a183343573c2a48248923b96d316c0956727c /include/dtt.h | |
| parent | 9dbc366744960013965fce8851035b6141f3b3ae (diff) | |
| parent | f82642e33899766892499b163e60560fbbf87773 (diff) | |
| download | olio-uboot-2014.01-50bd0057ba8fceeb48533f8b1a652ccd0e170838.tar.xz olio-uboot-2014.01-50bd0057ba8fceeb48533f8b1a652ccd0e170838.zip | |
Merge git://git.denx.de/u-boot into x1
Conflicts:
drivers/usb/usb_ohci.c
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 0c8ee7693..399b64aba 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 */ |