Skip to content

Commit

Permalink
Merge "smdk4412: prevent freeze on smart dock plug" into kk4.4
Browse files Browse the repository at this point in the history
  • Loading branch information
@kufikugel
kufikugel authored and Gerrit Code Review committed Dec 22, 2013
2 parents f678179 + 3082251 commit 1f990fd
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion arch/arm/configs/slim_i9300_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1267,7 +1267,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
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/configs/slim_i9305_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1229,7 +1229,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
Expand Down
6 changes: 3 additions & 3 deletions arch/arm/configs/slim_n7100_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1269,9 +1269,9 @@ 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_SUPPORT_OTG_AUDIO_DOCK is not set
# CONFIG_MUIC_MAX77693_SUPPORT_SMART_DOCK 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
# CONFIG_USBHUB_USB3503 is not set
# CONFIG_USBHUB_USB3503_OTG_CONN is not set
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/configs/slim_t0ltecdma_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1250,7 +1250,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
Expand Down

0 comments on commit 1f990fd

Please sign in to comment.