diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-12-17 16:53:07 +0100 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-12-17 16:53:07 +0100 |
| commit | cb5473205206c7f14cbb1e747f28ec75b48826e2 (patch) | |
| tree | 8f4808d60917100b18a10b05230f7638a0a9bbcc /include/dtt.h | |
| parent | baf449fc5ff96f071bb0e3789fd3265f6d4fd9a0 (diff) | |
| parent | 92c78a3bbcb2ce508b4bf1c4a1e0940406a024bb (diff) | |
| download | olio-uboot-2014.01-cb5473205206c7f14cbb1e747f28ec75b48826e2.tar.xz olio-uboot-2014.01-cb5473205206c7f14cbb1e747f28ec75b48826e2.zip | |
Merge branch 'fixes' into cleanups
Conflicts:
board/atmel/atngw100/atngw100.c
board/atmel/atstk1000/atstk1000.c
cpu/at32ap/at32ap700x/gpio.c
include/asm-avr32/arch-at32ap700x/clk.h
include/configs/atngw100.h
include/configs/atstk1002.h
include/configs/atstk1003.h
include/configs/atstk1004.h
include/configs/atstk1006.h
include/configs/favr-32-ezkit.h
include/configs/hammerhead.h
include/configs/mimc200.h
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 */ |