Merge tag 'usb-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

[linux-2.6-block.git] / drivers / usb / dwc3 / dwc3-omap.c

diff --git a/drivers/usb/dwc3/dwc3-omap.c b/drivers/usb/dwc3/dwc3-omap.c
index 80b3357034b7f7f804f1fe6879bcd00a04487683..1160ff41bed4972fb2c11ea576ddecfc9a9f2548 100644 (file)
--- a/drivers/usb/dwc3/dwc3-omap.c
+++ b/drivers/usb/dwc3/dwc3-omap.c
@@ -29,7 +29,6 @@
 #include <linux/of.h>
 #include <linux/of_platform.h>
 #include <linux/extcon.h>
-#include <linux/extcon/of_extcon.h>
 #include <linux/regulator/consumer.h>
 
 #include <linux/usb/otg.h>
@@ -517,7 +516,7 @@ static int dwc3_omap_probe(struct platform_device *pdev)
        dwc3_omap_enable_irqs(omap);
 
        if (of_property_read_bool(node, "extcon")) {
-               edev = of_extcon_get_extcon_dev(dev, 0);
+               edev = extcon_get_edev_by_phandle(dev, 0);
                if (IS_ERR(edev)) {
                        dev_vdbg(dev, "couldn't get extcon device\n");
                        ret = -EPROBE_DEFER;