diff options
author | Rob Herring <robh@kernel.org> | 2015-03-10 09:03:04 -0500 |
---|---|---|
committer | Rob Herring <robh@kernel.org> | 2015-03-10 09:03:04 -0500 |
commit | 2c192699a7050ef5bdf1e2cc95fdddfbcf524509 (patch) | |
tree | 945d4553691ecb24151a2fa83b7d489665dd3248 /drivers/usb/renesas_usbhs/Kconfig | |
parent | serial: add device tree binding documentation for ETRAX FS UART (diff) | |
parent | Linux 4.0-rc3 (diff) | |
download | linux-dev-2c192699a7050ef5bdf1e2cc95fdddfbcf524509.tar.xz linux-dev-2c192699a7050ef5bdf1e2cc95fdddfbcf524509.zip |
Merge tag 'v4.0-rc3' into HEAD
Linux 4.0-rc3
Merging in v4.0-rc3 because commit 30a22c215a00 (console: Fix
console name size mismatch) is a dependency.
Diffstat (limited to 'drivers/usb/renesas_usbhs/Kconfig')
-rw-r--r-- | drivers/usb/renesas_usbhs/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/renesas_usbhs/Kconfig b/drivers/usb/renesas_usbhs/Kconfig index de83b9d0cd5c..ebc99ee076ce 100644 --- a/drivers/usb/renesas_usbhs/Kconfig +++ b/drivers/usb/renesas_usbhs/Kconfig @@ -6,6 +6,7 @@ config USB_RENESAS_USBHS tristate 'Renesas USBHS controller' depends on USB_GADGET depends on ARCH_SHMOBILE || SUPERH || COMPILE_TEST + depends on EXTCON || !EXTCON # if EXTCON=m, USBHS cannot be built-in default n help Renesas USBHS is a discrete USB host and peripheral controller chip |