diff options
| author | Denys Dmytriyenko <denys@ti.com> | 2014-10-10 14:56:14 -0400 |
|---|---|---|
| committer | Denys Dmytriyenko <denys@ti.com> | 2014-10-10 14:56:14 -0400 |
| commit | 651f0b46734dbf13d4242282919253e150eb83ae (patch) | |
| tree | eb58a06c459aae905e116a2dbc83985fc9a63ffa /conf | |
| parent | a9a74cc33dded238756eb81879d01a6eac64e503 (diff) | |
| download | meta-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')
| -rw-r--r-- | conf/machine/include/dra7xx.inc | 2 |
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 @@ | |||
| 1 | require conf/machine/include/omap-a15.inc | 1 | require conf/machine/include/omap-a15.inc |
| 2 | SOC_FAMILY_append = ":dra7xx" | 2 | SOC_FAMILY_append = ":dra7xx" |
| 3 | 3 | ||
| 4 | MACHINE_FEATURES += "pci mmip" | 4 | MACHINE_FEATURES += "pci" |