diff options
Diffstat (limited to 'include/configs/motionpro.h')
| -rw-r--r-- | include/configs/motionpro.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/include/configs/motionpro.h b/include/configs/motionpro.h index cb5c346..aaa8962 100644 --- a/include/configs/motionpro.h +++ b/include/configs/motionpro.h @@ -33,7 +33,6 @@ /* * Command line configuration. */ -#define CONFIG_CMD_DTT #define CONFIG_CMD_IDE #define CONFIG_CMD_IMMAP #define CONFIG_CMD_JFFS2 @@ -268,6 +267,13 @@ #define LED_ON 0x00000010 /* +<<<<<<< 4ba57299158b7a7020d2bd3b8d8369884696a0ae +======= + * Temperature sensor + */ + +/* +>>>>>>> Drop digital thermometer and thermostat (DTT) drivers * Environment settings */ #define CONFIG_ENV_IS_IN_FLASH 1 |