summaryrefslogtreecommitdiff
path: root/conf/machine
diff options
context:
space:
mode:
Diffstat (limited to 'conf/machine')
-rw-r--r--conf/machine/mtcdt.conf3
1 files changed, 0 insertions, 3 deletions
diff --git a/conf/machine/mtcdt.conf b/conf/machine/mtcdt.conf
index 0fef766..953f698 100644
--- a/conf/machine/mtcdt.conf
+++ b/conf/machine/mtcdt.conf
@@ -14,10 +14,7 @@ PREFERRED_VERSION_kernel-module-vizzini ?= "1.1"
DEFAULTTUNE = "arm926ejs"
TUNE_CCARGS = " -march=armv5te -marm -mthumb-interwork -mtune=arm926ej-s"
TUNE_FEATURES = "arm armv5 thumb dsp arm926ejs"
-<<<<<<< HEAD
ARMPKGSFX_THUMB="t"
-=======
->>>>>>> Initial commit of Yocto 2.1 changes
# used by sysvinit_2
SERIAL_CONSOLES = "115200;ttyS0"