aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorDaniel Hillenbrand <codeworkx@cyanogenmod.org>2013-06-04 01:33:22 +0200
committerDaniel Hillenbrand <codeworkx@cyanogenmod.org>2013-06-04 12:54:26 +0200
commit55bb2048feb59f2190f704c2a4df81b557b55c7a (patch)
treecbb680a60770fb762e5b27c502ad71c2366bf604 /drivers/usb
parent3d8b293a4f5042cd9fdc4009a40f6483371cd489 (diff)
downloadkernel_samsung_smdk4412-55bb2048feb59f2190f704c2a4df81b557b55c7a.zip
kernel_samsung_smdk4412-55bb2048feb59f2190f704c2a4df81b557b55c7a.tar.gz
kernel_samsung_smdk4412-55bb2048feb59f2190f704c2a4df81b557b55c7a.tar.bz2
smdk4412: bulk update from i9300 update 9
Change-Id: Icd3e7b601f3f4c8b3dcf053fed5819fb7caf5296
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/core/sec-dock.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/usb/core/sec-dock.h b/drivers/usb/core/sec-dock.h
index 1521b67..73c4ea6 100644
--- a/drivers/usb/core/sec-dock.h
+++ b/drivers/usb/core/sec-dock.h
@@ -9,9 +9,6 @@
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*/
-#if defined(CONFIG_MUIC_MAX77693_SUPPORT_OTG_AUDIO_DOCK)
-#include <linux/mfd/max77693.h>
-#endif /* CONFIG_MUIC_MAX77693_SUPPORT_OTG_AUDIO_DOCK */
#include <linux/power_supply.h>
#define PSY_CHG_NAME "max77693-charger"
@@ -48,7 +45,6 @@ static void call_audiodock_notify(struct usb_device *dev)
id->idVendor == le16_to_cpu(dev->descriptor.idVendor) &&
id->idProduct == le16_to_cpu(dev->descriptor.idProduct)) {
dev_info(&dev->dev, "Audio Dock is connected!\n");
- max77693_muic_attach_audio_dock();
return;
}
}