summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denys@ti.com>2014-10-10 14:55:44 -0400
committerDenys Dmytriyenko <denys@ti.com>2014-10-10 14:55:44 -0400
commitae064c55f3da416df7e37db3c339834ef13656ac (patch)
treeeb58a06c459aae905e116a2dbc83985fc9a63ffa
parentcbd2f82aad2a29415cd483ccd9fa9b394ae74bbf (diff)
downloadmeta-ti-ae064c55f3da416df7e37db3c339834ef13656ac.tar.gz
Revert "dra7xx: add "mmip" to MACHINE_FEATURES"
Results in gstreamer conflicts in SDK. This reverts commit 2dce435ff1dc09637d62f59d179fb89c468c0818.
-rw-r--r--conf/machine/include/dra7xx.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/machine/include/dra7xx.inc b/conf/machine/include/dra7xx.inc
index a7c8782c..857e1b35 100644
--- a/conf/machine/include/dra7xx.inc
+++ b/conf/machine/include/dra7xx.inc
@@ -1,4 +1,4 @@
1require conf/machine/include/omap-a15.inc 1require conf/machine/include/omap-a15.inc
2SOC_FAMILY_append = ":dra7xx" 2SOC_FAMILY_append = ":dra7xx"
3 3
4MACHINE_FEATURES += "pci mmip" 4MACHINE_FEATURES += "pci"