diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-05-13 16:03:10 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-05-13 16:04:02 -0700 |
| commit | 2efeaeb00f26c13ac14b8d53684a8bbd3c343ce6 (patch) | |
| tree | 7ad4ff45c9f6471dca1b6b004cf3757512a20a15 /drivers/usb/musb/Makefile | |
| parent | 472b91274a6c6857877b5caddb875dcb5ecdfcb8 (diff) | |
| parent | 43b416e5f6a3ce269571cfe25c8f1e8e9316c5b0 (diff) | |
| download | linux-2efeaeb00f26c13ac14b8d53684a8bbd3c343ce6.tar.gz linux-2efeaeb00f26c13ac14b8d53684a8bbd3c343ce6.tar.bz2 linux-2efeaeb00f26c13ac14b8d53684a8bbd3c343ce6.zip | |
Merge branch 'for-next' of master.kernel.org:/pub/scm/linux/kernel/git/balbi/usb into usb-next
* 'for-next' of master.kernel.org:/pub/scm/linux/kernel/git/balbi/usb:
MAINTAINERS: tree moved to kernel.org
usb: musb: Calling VBUS pulsing API when SRP is initiated.
usb: otg: TWL6030: OMAP4430: Adding SRP VBUS pulsing API
usb: musb: host: remove duplicate check in musb_ep_program()
usb: musb: export musb_interrupt symbol
usb: musb: allow musb and glue layers to be modules
usb: musb: drop unneeded musb_debug trickery
Diffstat (limited to 'drivers/usb/musb/Makefile')
| -rw-r--r-- | drivers/usb/musb/Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/usb/musb/Makefile b/drivers/usb/musb/Makefile index 74df5284894f..4e15281b9e02 100644 --- a/drivers/usb/musb/Makefile +++ b/drivers/usb/musb/Makefile @@ -2,8 +2,6 @@ # for USB OTG silicon based on Mentor Graphics INVENTRA designs # -ccflags-$(CONFIG_USB_MUSB_DEBUG) := -DDEBUG - obj-$(CONFIG_USB_MUSB_HDRC) += musb_hdrc.o musb_hdrc-y := musb_core.o |