diff options
| author | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-22 09:48:20 +0200 |
|---|---|---|
| committer | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-22 14:02:16 +0200 |
| commit | 2489007e7d740ccbc3e0a202914e243ad5178787 (patch) | |
| tree | b8e6380ea7b1da63474ad68a5dba997e01146043 /drivers/usb/misc/exynos-usb-switch.c | |
| parent | 5f67568eb31e3a813c7c52461dcf66ade15fc2e7 (diff) | |
| download | kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.zip kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.gz kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.bz2 | |
merge opensource jb u5
Change-Id: I1aaec157aa196f3448eff8636134fce89a814cf2
Diffstat (limited to 'drivers/usb/misc/exynos-usb-switch.c')
| -rw-r--r-- | drivers/usb/misc/exynos-usb-switch.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/misc/exynos-usb-switch.c b/drivers/usb/misc/exynos-usb-switch.c index 519c845..3acb66e 100644 --- a/drivers/usb/misc/exynos-usb-switch.c +++ b/drivers/usb/misc/exynos-usb-switch.c @@ -34,7 +34,7 @@ static const char switch_name[] = "exynos_usb_switch"; static struct exynos_usb_switch *our_switch; -#if defined(CONFIG_BATTERY_SAMSUNG) || defined(CONFIG_BATTERY_SAMSUNG_S2PLUS) +#if defined(CONFIG_BATTERY_SAMSUNG) void exynos_usb_cable_connect(void) { samsung_cable_check_status(1); @@ -158,13 +158,13 @@ static int exynos_change_usb_mode(struct exynos_usb_switch *usb_switch, if (usb_switch->gpio_host_vbus) set_host_vbus(usb_switch, 0); -#if defined(CONFIG_BATTERY_SAMSUNG) || defined(CONFIG_BATTERY_SAMSUNG_S2PLUS) +#if defined(CONFIG_BATTERY_SAMSUNG) exynos_usb_cable_disconnect(); #endif clear_bit(USB_HOST_ATTACHED, &usb_switch->connect); break; case USB_HOST_ATTACHED: -#if defined(CONFIG_BATTERY_SAMSUNG) || defined(CONFIG_BATTERY_SAMSUNG_S2PLUS) +#if defined(CONFIG_BATTERY_SAMSUNG) exynos_usb_cable_connect(); #endif if (usb_switch->gpio_host_vbus) |