X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Fconfigs%2Fmotionpro.h;h=75633f66ef849345297076e83f29e99ab69178e6;hb=b8682a7fcf69344ac5a2d57c75f9c93bfdc93142;hp=035f1dc5f9694675ef38ce6e601dfb37aa792f76;hpb=7d0f5c1300555101e1625ed7256ee6c3502e8482;p=platform%2Fkernel%2Fu-boot.git

diff --git a/include/configs/motionpro.h b/include/configs/motionpro.h
index 035f1dc..75633f6 100644
--- a/include/configs/motionpro.h
+++ b/include/configs/motionpro.h
@@ -33,7 +33,6 @@
 /*
  * Command line configuration.
  */
-#define CONFIG_CMD_JFFS2
 #define CONFIG_CMD_REGINFO
 
 /*
@@ -265,13 +264,6 @@
 #define LED_ON			0x00000010
 
 /*
-<<<<<<< 4ba57299158b7a7020d2bd3b8d8369884696a0ae
-=======
- * Temperature sensor
- */
-
-/*
->>>>>>> Drop digital thermometer and thermostat (DTT) drivers
  * Environment settings
  */
 #define CONFIG_ENV_IS_IN_FLASH	1