diff options
| author | Hemant Hariyani | 2014-09-10 14:26:56 -0500 |
|---|---|---|
| committer | Hemant Hariyani | 2014-09-10 14:26:56 -0500 |
| commit | 86e05d1176bb77d61ba903a1419b56ea33e5a3c8 (patch) | |
| tree | b45518b4ed1b981f43281134bd05c7a06a67fe4f | |
| parent | bfbf8b9fb62c8c73802e09a48d622d4d29d8217a (diff) | |
| download | kernel-video-ti-linux-3.14.y-drm-wip-v1.tar.gz kernel-video-ti-linux-3.14.y-drm-wip-v1.tar.xz kernel-video-ti-linux-3.14.y-drm-wip-v1.zip | |
Revert "ti_config_fragments/android_omap: sdk: Enable OMAPDRM as built-in"ti-linux-3.14.y-drm-wip-v1
This reverts commit b36457332781f873be72676c4492ec013c58addd.
This is enabled in ti_config_fragments/audio_display.cfg
Conflicts:
ti_config_fragments/android_omap.cfg
| -rw-r--r-- | ti_config_fragments/android_omap.cfg | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/ti_config_fragments/android_omap.cfg b/ti_config_fragments/android_omap.cfg index ba4079ac12c..bf80b4c1abd 100644 --- a/ti_config_fragments/android_omap.cfg +++ b/ti_config_fragments/android_omap.cfg | |||
| @@ -19,9 +19,6 @@ CONFIG_ANDROID_LOW_MEMORY_KILLER=y | |||
| 19 | CONFIG_ANDROID_LOW_MEMORY_KILLER_AUTODETECT_OOM_ADJ_VALUES=y | 19 | CONFIG_ANDROID_LOW_MEMORY_KILLER_AUTODETECT_OOM_ADJ_VALUES=y |
| 20 | CONFIG_ANDROID_INTF_ALARM_DEV=y | 20 | CONFIG_ANDROID_INTF_ALARM_DEV=y |
| 21 | 21 | ||
| 22 | # make DRM modules builtin to Android kernel | ||
| 23 | CONFIG_DRM_OMAP=y | ||
| 24 | |||
| 25 | #enable RPMSG and REMOTEPROC as builtin | 22 | #enable RPMSG and REMOTEPROC as builtin |
| 26 | CONFIG_REMOTEPROC=y | 23 | CONFIG_REMOTEPROC=y |
| 27 | CONFIG_OMAP_REMOTEPROC=y | 24 | CONFIG_OMAP_REMOTEPROC=y |