mirror of
https://github.com/torvalds/linux.git
synced 2024-12-21 02:21:36 +00:00
a481991467
Here is the big USB 3.5-rc1 pull request for the 3.5-rc1 merge window. It's touches a lot of different parts of the kernel, all USB drivers, due to some API cleanups (getting rid of the ancient err() macro) and some changes that are needed for USB 3.0 power management updates. There are also lots of new drivers, pimarily gadget, but others as well. We deleted a staging driver, which was nice, and finally dropped the obsolete usbfs code, which will make Al happy to never have to touch that again. There were some build errors in the tree that linux-next found a few days ago, but those were fixed by the most recent changes (all were due to us not building with CONFIG_PM disabled.) Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) iEYEABECAAYFAk+7qs0ACgkQMUfUDdst+ymjOgCfeoWqWk1bsKKt6SZULvQois5i 3csAn1Uapcm8Uswwpnj2v1/2Zh4rBHLA =4jM1 -----END PGP SIGNATURE----- Merge tag 'usb-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb Pull USB 3.5-rc1 changes from Greg Kroah-Hartman: "Here is the big USB 3.5-rc1 pull request for the 3.5-rc1 merge window. It's touches a lot of different parts of the kernel, all USB drivers, due to some API cleanups (getting rid of the ancient err() macro) and some changes that are needed for USB 3.0 power management updates. There are also lots of new drivers, pimarily gadget, but others as well. We deleted a staging driver, which was nice, and finally dropped the obsolete usbfs code, which will make Al happy to never have to touch that again. There were some build errors in the tree that linux-next found a few days ago, but those were fixed by the most recent changes (all were due to us not building with CONFIG_PM disabled.) Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>" * tag 'usb-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (477 commits) xhci: Fix DIV_ROUND_UP compile error. xhci: Fix compile with CONFIG_USB_SUSPEND=n USB: Fix core compile with CONFIG_USB_SUSPEND=n brcm80211: Fix compile error for .disable_hub_initiated_lpm. Revert "USB: EHCI: work around bug in the Philips ISP1562 controller" MAINTAINERS: Add myself as maintainer to the USB PHY Layer USB: EHCI: fix command register configuration lost problem USB: Remove races in devio.c USB: ehci-platform: remove update_device USB: Disable hub-initiated LPM for comms devices. xhci: Add Intel U1/U2 timeout policy. xhci: Add infrastructure for host-specific LPM policies. USB: Add macros for interrupt endpoint types. xhci: Reserve one command for USB3 LPM disable. xhci: Some Evaluate Context commands must succeed. USB: Disable USB 3.0 LPM in critical sections. USB: Add support to enable/disable USB3 link states. USB: Allow drivers to disable hub-initiated LPM. USB: Calculate USB 3.0 exit latencies for LPM. USB: Refactor code to set LPM support flag. ... Conflicts: arch/arm/mach-exynos/mach-nuri.c arch/arm/mach-exynos/mach-universal_c210.c drivers/net/wireless/ath/ath6kl/usb.c
74 lines
2.4 KiB
Makefile
74 lines
2.4 KiB
Makefile
#
|
|
# USB peripheral controller drivers
|
|
#
|
|
ccflags-$(CONFIG_USB_GADGET_DEBUG) := -DDEBUG
|
|
|
|
obj-$(CONFIG_USB_GADGET) += udc-core.o
|
|
obj-$(CONFIG_USB_DUMMY_HCD) += dummy_hcd.o
|
|
obj-$(CONFIG_USB_NET2272) += net2272.o
|
|
obj-$(CONFIG_USB_NET2280) += net2280.o
|
|
obj-$(CONFIG_USB_AMD5536UDC) += amd5536udc.o
|
|
obj-$(CONFIG_USB_PXA25X) += pxa25x_udc.o
|
|
obj-$(CONFIG_USB_PXA27X) += pxa27x_udc.o
|
|
obj-$(CONFIG_USB_IMX) += imx_udc.o
|
|
obj-$(CONFIG_USB_GOKU) += goku_udc.o
|
|
obj-$(CONFIG_USB_OMAP) += omap_udc.o
|
|
obj-$(CONFIG_USB_S3C2410) += s3c2410_udc.o
|
|
obj-$(CONFIG_USB_AT91) += at91_udc.o
|
|
obj-$(CONFIG_USB_ATMEL_USBA) += atmel_usba_udc.o
|
|
obj-$(CONFIG_USB_FSL_USB2) += fsl_usb2_udc.o
|
|
fsl_usb2_udc-y := fsl_udc_core.o
|
|
fsl_usb2_udc-$(CONFIG_ARCH_MXC) += fsl_mxc_udc.o
|
|
obj-$(CONFIG_USB_M66592) += m66592-udc.o
|
|
obj-$(CONFIG_USB_R8A66597) += r8a66597-udc.o
|
|
obj-$(CONFIG_USB_FSL_QE) += fsl_qe_udc.o
|
|
obj-$(CONFIG_USB_S3C_HSOTG) += s3c-hsotg.o
|
|
obj-$(CONFIG_USB_S3C_HSUDC) += s3c-hsudc.o
|
|
obj-$(CONFIG_USB_LPC32XX) += lpc32xx_udc.o
|
|
obj-$(CONFIG_USB_EG20T) += pch_udc.o
|
|
obj-$(CONFIG_USB_MV_UDC) += mv_udc.o
|
|
mv_udc-y := mv_udc_core.o
|
|
obj-$(CONFIG_USB_FUSB300) += fusb300_udc.o
|
|
|
|
#
|
|
# USB gadget drivers
|
|
#
|
|
g_zero-y := zero.o
|
|
g_audio-y := audio.o
|
|
g_ether-y := ether.o
|
|
g_serial-y := serial.o
|
|
g_midi-y := gmidi.o
|
|
gadgetfs-y := inode.o
|
|
g_file_storage-y := file_storage.o
|
|
g_mass_storage-y := mass_storage.o
|
|
g_printer-y := printer.o
|
|
g_cdc-y := cdc2.o
|
|
g_multi-y := multi.o
|
|
g_hid-y := hid.o
|
|
g_dbgp-y := dbgp.o
|
|
g_nokia-y := nokia.o
|
|
g_webcam-y := webcam.o
|
|
g_ncm-y := ncm.o
|
|
g_acm_ms-y := acm_ms.o
|
|
g_tcm_usb_gadget-y := tcm_usb_gadget.o
|
|
|
|
obj-$(CONFIG_USB_ZERO) += g_zero.o
|
|
obj-$(CONFIG_USB_AUDIO) += g_audio.o
|
|
obj-$(CONFIG_USB_ETH) += g_ether.o
|
|
obj-$(CONFIG_USB_GADGETFS) += gadgetfs.o
|
|
obj-$(CONFIG_USB_FUNCTIONFS) += g_ffs.o
|
|
obj-$(CONFIG_USB_FILE_STORAGE) += g_file_storage.o
|
|
obj-$(CONFIG_USB_MASS_STORAGE) += g_mass_storage.o
|
|
obj-$(CONFIG_USB_G_SERIAL) += g_serial.o
|
|
obj-$(CONFIG_USB_G_PRINTER) += g_printer.o
|
|
obj-$(CONFIG_USB_MIDI_GADGET) += g_midi.o
|
|
obj-$(CONFIG_USB_CDC_COMPOSITE) += g_cdc.o
|
|
obj-$(CONFIG_USB_G_HID) += g_hid.o
|
|
obj-$(CONFIG_USB_G_DBGP) += g_dbgp.o
|
|
obj-$(CONFIG_USB_G_MULTI) += g_multi.o
|
|
obj-$(CONFIG_USB_G_NOKIA) += g_nokia.o
|
|
obj-$(CONFIG_USB_G_WEBCAM) += g_webcam.o
|
|
obj-$(CONFIG_USB_G_NCM) += g_ncm.o
|
|
obj-$(CONFIG_USB_G_ACM_MS) += g_acm_ms.o
|
|
obj-$(CONFIG_USB_GADGET_TARGET) += tcm_usb_gadget.o
|