diff options
| author | Scott Brissenden <sbrissen@hotmail.com> | 2013-12-13 22:59:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2013-12-13 22:59:20 +0000 |
| commit | f48a2082edfcc0cf24b09aa7ccadbb3f5e66b68f (patch) | |
| tree | 29faa93ebc1eaa4e9275119785346c86dcc49766 | |
| parent | cb45b00f2febffb7711f898f2e98e7f53a0c84ba (diff) | |
| parent | 789199265ab10aa13e8835c3cf8e732a9078619d (diff) | |
| download | kernel_samsung_smdk4412-f48a2082edfcc0cf24b09aa7ccadbb3f5e66b68f.zip kernel_samsung_smdk4412-f48a2082edfcc0cf24b09aa7ccadbb3f5e66b68f.tar.gz kernel_samsung_smdk4412-f48a2082edfcc0cf24b09aa7ccadbb3f5e66b68f.tar.bz2 | |
Merge "i9305/t0ltecdma: prevent freeze on smart dock plug" into cm-11.0
| -rwxr-xr-x | arch/arm/configs/cyanogenmod_i9305_defconfig | 2 | ||||
| -rwxr-xr-x | arch/arm/configs/cyanogenmod_t0ltecdma_defconfig | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/configs/cyanogenmod_i9305_defconfig b/arch/arm/configs/cyanogenmod_i9305_defconfig index 301b391..3954dcb 100755 --- a/arch/arm/configs/cyanogenmod_i9305_defconfig +++ b/arch/arm/configs/cyanogenmod_i9305_defconfig @@ -1232,7 +1232,7 @@ CONFIG_UID_STAT=y # CONFIG_FM34_WE395 is not set # CONFIG_AUDIENCE_ES305 is not set # CONFIG_2MIC_FM34_WE395 is not set -# CONFIG_MUIC_MAX77693_SEPARATE_MHL_PORT is not set +CONFIG_MUIC_MAX77693_SEPARATE_MHL_PORT=y CONFIG_MUIC_MAX77693_SUPPORT_OTG_AUDIO_DOCK=y CONFIG_MUIC_MAX77693_SUPPORT_SMART_DOCK=y CONFIG_MUIC_MAX77693_SUPPORT_CAR_DOCK=y diff --git a/arch/arm/configs/cyanogenmod_t0ltecdma_defconfig b/arch/arm/configs/cyanogenmod_t0ltecdma_defconfig index 7ad48e7..42f9297 100755 --- a/arch/arm/configs/cyanogenmod_t0ltecdma_defconfig +++ b/arch/arm/configs/cyanogenmod_t0ltecdma_defconfig @@ -1253,7 +1253,7 @@ CONFIG_UID_STAT=y # CONFIG_FM34_WE395 is not set # CONFIG_AUDIENCE_ES305 is not set # CONFIG_2MIC_FM34_WE395 is not set -# CONFIG_MUIC_MAX77693_SEPARATE_MHL_PORT is not set +CONFIG_MUIC_MAX77693_SEPARATE_MHL_PORT=y CONFIG_MUIC_MAX77693_SUPPORT_OTG_AUDIO_DOCK=y CONFIG_MUIC_MAX77693_SUPPORT_SMART_DOCK=y CONFIG_MUIC_MAX77693_SUPPORT_CAR_DOCK=y |