2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-25 05:34:00 +08:00
linux-next/include/linux/usb
Linus Torvalds 3e5b08cbbf Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
* 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (144 commits)
  USB: add support for Dream Cheeky DL100B Webmail Notifier (1d34:0004)
  USB: serial: ftdi_sio: add support for TIOCSERGETLSR
  USB: ehci-mxc: Setup portsc register prior to accessing OTG viewport
  USB: atmel_usba_udc: fix freeing irq in usba_udc_remove()
  usb: ehci-omap: fix tll channel enable mask
  usb: ohci-omap3: fix trivial typo
  USB: gadget: ci13xxx: don't assume that PAGE_SIZE is 4096
  USB: gadget: ci13xxx: fix complete() callback for no_interrupt rq's
  USB: gadget: update ci13xxx to work with g_ether
  USB: gadgets: ci13xxx: fix probing of compiled-in gadget drivers
  Revert "USB: musb: pm: don't rely fully on clock support"
  Revert "USB: musb: blackfin: pm: make it work"
  USB: uas: Use GFP_NOIO instead of GFP_KERNEL in I/O submission path
  USB: uas: Ensure we only bind to a UAS interface
  USB: uas: Rename sense pipe and sense urb to status pipe and status urb
  USB: uas: Use kzalloc instead of kmalloc
  USB: uas: Fix up the Sense IU
  usb: musb: core: kill unneeded #include's
  DA8xx: assign name to MUSB IRQ resource
  usb: gadget: g_ncm added
  ...

Manually fix up trivial conflicts in USB Kconfig changes in:
	arch/arm/mach-omap2/Kconfig
	arch/sh/Kconfig
	drivers/usb/Kconfig
	drivers/usb/host/ehci-hcd.c
and annoying chip clock data conflicts in:
	arch/arm/mach-omap2/clock3xxx_data.c
	arch/arm/mach-omap2/clock44xx_data.c
2011-01-07 13:16:28 -08:00
..
association.h
atmel_usba_udc.h
audio-v2.h
audio.h
c67x00.h
cdc.h USB: cdc.h: ncm: fix one more typo 2010-10-22 10:21:48 -07:00
ch9.h usb: gadget: langwell_udc: add usb test mode support 2010-11-30 16:50:36 -08:00
ch11.h usb: USB3.0 ch11 definitions 2010-11-11 06:19:35 -08:00
composite.h usb gadget: don't save bind callback in struct usb_configuration 2010-10-22 10:21:26 -07:00
ehci_def.h USB: EHCI: EHCI 1.1 addendum: preparation 2010-08-10 14:35:35 -07:00
functionfs.h USB: gadget: f_fs: functionfs_add() renamed to functionfs_bind_config() 2010-08-10 14:35:36 -07:00
g_hid.h
g_printer.h
gadget.h usb gadget: don't save bind callback in struct usb_gadget_driver 2010-10-22 10:21:25 -07:00
gadgetfs.h
gpio_vbus.h
hcd.h usb: USB3.0 ch11 definitions 2010-11-11 06:19:35 -08:00
input.h
intel_mid_otg.h USB OTG: Add common data structure for Intel MID Platform (Langwell/Penwell) 2010-10-22 10:21:33 -07:00
iowarrior.h
irda.h
isp116x.h
isp1362.h
isp1760.h
Kbuild
langwell_otg.h USB OTG Langwell: Update OTG Kconfig and driver version. 2010-10-22 10:21:33 -07:00
langwell_udc.h
m66592.h
midi.h
msm_hsusb_hw.h USB: OTG: msm: Add support for power management 2010-12-10 14:23:32 -08:00
msm_hsusb.h USB: OTG: msm: Add support for power management 2010-12-10 14:23:32 -08:00
musb.h Merge branch 'usb-next' into musb-merge 2010-12-16 10:05:06 -08:00
net2280.h
otg.h USB: otg: fix link breakage, when the NOP USB Xceiver is a module 2010-12-10 14:18:36 -08:00
quirks.h USB delay init quirk for logitech Harmony 700-series devices 2010-08-10 14:35:41 -07:00
r8a66597.h
rndis_host.h
serial.h tty: Make tiocgicount a handler 2010-10-22 10:20:04 -07:00
sl811.h
storage.h USB: Move USB Storage definitions to their own header file 2010-10-22 10:21:50 -07:00
tmc.h
ulpi.h USB: otg/ulpi: extend the generic ulpi driver. 2010-08-10 14:35:40 -07:00
usbnet.h usbnet: changes for upcoming cdc_ncm driver 2010-12-06 12:59:02 -08:00
video.h
wusb-wa.h
wusb.h