diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2013-08-09 13:00:39 +0930 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2013-08-09 13:00:39 +0930 |
| commit | 11489736177c5930514482b4db7af862d945335d (patch) | |
| tree | 8590ec4ba037b79c94982e15922fe50a1f0193a3 /drivers/usb/dwc3/Kconfig | |
| parent | 3f0d0c9b47e09d47fcb755fed786a1ee88e110b5 (diff) | |
| parent | 6c2580c501c660fdfb506061e016d84570fceba1 (diff) | |
| download | linux-11489736177c5930514482b4db7af862d945335d.tar.bz2 | |
Merge branch 'master' into virtio-next
The next commit gets conflicts because it relies on patches which were
cc:stable and thus had to be merged into Linus' tree before the coming
merge window. So pull in master now.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'drivers/usb/dwc3/Kconfig')
| -rw-r--r-- | drivers/usb/dwc3/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/dwc3/Kconfig b/drivers/usb/dwc3/Kconfig index 757aa18027d0..2378958ea63e 100644 --- a/drivers/usb/dwc3/Kconfig +++ b/drivers/usb/dwc3/Kconfig @@ -1,6 +1,6 @@ config USB_DWC3 tristate "DesignWare USB3 DRD Core Support" - depends on (USB || USB_GADGET) && GENERIC_HARDIRQS + depends on (USB || USB_GADGET) && GENERIC_HARDIRQS && HAS_DMA select USB_XHCI_PLATFORM if USB_SUPPORT && USB_XHCI_HCD help Say Y or M here if your system has a Dual Role SuperSpeed |