summaryrefslogtreecommitdiffstats
path: root/conf/machine
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denys@ti.com>2014-10-10 14:56:14 -0400
committerDenys Dmytriyenko <denys@ti.com>2014-10-10 14:56:14 -0400
commit651f0b46734dbf13d4242282919253e150eb83ae (patch)
treeeb58a06c459aae905e116a2dbc83985fc9a63ffa /conf/machine
parenta9a74cc33dded238756eb81879d01a6eac64e503 (diff)
downloadmeta-ti-651f0b46734dbf13d4242282919253e150eb83ae.tar.gz
Revert "dra7xx: add "mmip" to MACHINE_FEATURES"
Results in gstreamer conflicts in SDK. This reverts commit aedc4d91bc5088ec6e6fe9d4de506503e201c6ca.
Diffstat (limited to 'conf/machine')
-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"