diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-12-06 17:07:15 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-12-06 17:07:15 +0100 |
| commit | 68ee93f3d058ff58f994d08be00d3aad9ec20970 (patch) | |
| tree | 5fb2d14340332062e416246c5759adcaa64a2340 /arch/arm/mach-exynos/sec-switch.c | |
| parent | 17021fd920fb5bc97a8c81a20b208c5b38f1b0e8 (diff) | |
| parent | b99374450c03bf5081b88995d91d34fb9b2fd040 (diff) | |
| download | kernel_samsung_smdk4412-68ee93f3d058ff58f994d08be00d3aad9ec20970.zip kernel_samsung_smdk4412-68ee93f3d058ff58f994d08be00d3aad9ec20970.tar.gz kernel_samsung_smdk4412-68ee93f3d058ff58f994d08be00d3aad9ec20970.tar.bz2 | |
Merge branch 'master' of fossencdi.org:kernel_samsung_smdk4412
Diffstat (limited to 'arch/arm/mach-exynos/sec-switch.c')
| -rw-r--r-- | arch/arm/mach-exynos/sec-switch.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/arch/arm/mach-exynos/sec-switch.c b/arch/arm/mach-exynos/sec-switch.c index 787a424..d9c9db5 100644 --- a/arch/arm/mach-exynos/sec-switch.c +++ b/arch/arm/mach-exynos/sec-switch.c @@ -452,7 +452,8 @@ void max77693_muic_init_cb(void) } #if !defined(CONFIG_MACH_GC1) && !defined(CONFIG_MACH_T0) && \ -!defined(CONFIG_MACH_M3) && !defined(CONFIG_MACH_SLP_T0_LTE) +!defined(CONFIG_MACH_M3) && !defined(CONFIG_MACH_SLP_T0_LTE) && \ +!defined(CONFIG_MACH_KONA) int max77693_muic_cfg_uart_gpio(void) { int uart_val, path; @@ -472,7 +473,8 @@ int max77693_muic_cfg_uart_gpio(void) #endif #if !defined(CONFIG_MACH_GC1) && !defined(CONFIG_MACH_T0) && \ -!defined(CONFIG_MACH_M3) && !defined(CONFIG_MACH_SLP_T0_LTE) +!defined(CONFIG_MACH_M3) && !defined(CONFIG_MACH_SLP_T0_LTE) && \ +!defined(CONFIG_MACH_KONA) void max77693_muic_jig_uart_cb(int path) { pr_info("func:%s : (path=%d\n", __func__, path); @@ -583,7 +585,8 @@ struct max77693_muic_data max77693_muic = { .init_cb = max77693_muic_init_cb, .dock_cb = max77693_muic_dock_cb, #if !defined(CONFIG_MACH_GC1) && !defined(CONFIG_MACH_T0) && \ -!defined(CONFIG_MACH_M3) && !defined(CONFIG_MACH_SLP_T0_LTE) +!defined(CONFIG_MACH_M3) && !defined(CONFIG_MACH_SLP_T0_LTE) && \ + !defined(CONFIG_MACH_KONA) .cfg_uart_gpio = max77693_muic_cfg_uart_gpio, .jig_uart_cb = max77693_muic_jig_uart_cb, #endif /* CONFIG_MACH_GC1 */ @@ -597,7 +600,8 @@ struct max77693_muic_data max77693_muic = { .host_notify_cb = NULL, #endif #if !defined(CONFIG_MACH_GC1) && !defined(CONFIG_MACH_T0) && \ -!defined(CONFIG_MACH_M3) && !defined(CONFIG_MACH_SLP_T0_LTE) +!defined(CONFIG_MACH_M3) && !defined(CONFIG_MACH_SLP_T0_LTE) && \ + !defined(CONFIG_MACH_KONA) .gpio_usb_sel = GPIO_USB_SEL, #else .gpio_usb_sel = -1, |