summaryrefslogtreecommitdiffstats
path: root/drivers/usb/Makefile
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2014-03-01 19:31:53 +0100
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2014-03-01 19:31:53 +0100
commit04421fe2671c1790ab6529fad87ce8c73af0e1eb (patch)
treed2f803b4eef6108648f1beee6bf97a342cd9bc73 /drivers/usb/Makefile
parentInput: imx_keypad - Propagate the real error code on platform_get_irq() failure (diff)
parentLinux 3.14-rc4 (diff)
downloadlinux-04421fe2671c1790ab6529fad87ce8c73af0e1eb.tar.xz
linux-04421fe2671c1790ab6529fad87ce8c73af0e1eb.zip
Merge tag 'v3.14-rc4' into next
Merge with Linux 3.14-rc4 to bring devm_request_any_context_irq().
Diffstat (limited to 'drivers/usb/Makefile')
-rw-r--r--drivers/usb/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile
index 70d7c5b92c3c..1ae2bf39d84b 100644
--- a/drivers/usb/Makefile
+++ b/drivers/usb/Makefile
@@ -7,6 +7,7 @@
obj-$(CONFIG_USB) += core/
obj-$(CONFIG_USB_DWC3) += dwc3/
+obj-$(CONFIG_USB_DWC2) += dwc2/
obj-$(CONFIG_USB_MON) += mon/