Merge tag 'char-misc-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[uclinux-h8/linux.git] / drivers / usb / phy / phy-tahvo.c

diff --git a/drivers/usb/phy/phy-tahvo.c b/drivers/usb/phy/phy-tahvo.c
index 2b28443..b40d6a8 100644 (file)
--- a/drivers/usb/phy/phy-tahvo.c
+++ b/drivers/usb/phy/phy-tahvo.c
@@ -60,10 +60,11 @@ struct tahvo_usb {
        struct extcon_dev       extcon;
 };
 
-static const char *tahvo_cable[] = {
-       "USB-HOST",
-       "USB",
-       NULL,
+static const unsigned int tahvo_cable[] = {
+       EXTCON_USB,
+       EXTCON_USB_HOST,
+
+       EXTCON_NONE,
 };
 
 static ssize_t vbus_state_show(struct device *device,