kernel-fxtec-pro1x/include/linux/usb
Linus Torvalds 1eb6337835 Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (348 commits)
  [media] pctv452e: Remove bogus code
  [media] adv7175: Make use of media bus pixel codes
  [media] media: vb2: fix incorrect return value
  [media] em28xx: implement VIDIOC_ENUM_FRAMESIZES
  [media] cx23885: Stop the risc video fifo before reconfiguring it
  [media] cx23885: Avoid incorrect error handling and reporting
  [media] cx23885: Avoid stopping the risc engine during buffer timeout
  [media] cx23885: Removed a spurious function cx23885_set_scale()
  [media] cx23885: v4l2 api compliance, set the audioset field correctly
  [media] cx23885: hook the audio selection functions into the main driver
  [media] cx23885: add generic functions for dealing with audio input selection
  [media] cx23885: fixes related to maximum number of inputs and range checking
  [media] cx23885: Initial support for the MPX-885 mini-card
  [media] cx25840: Ensure AUDIO6 and AUDIO7 trigger line-in baseband use
  [media] cx23885: Enable audio line in support from the back panel
  [media] cx23885: Allow the audio mux config to be specified on a per input basis
  [media] cx25840: Enable support for non-tuner LR1/LR2 audio inputs
  [media] cx23885: Name an internal i2c part and declare a bitfield by name
  [media] cx23885: Ensure VBI buffers timeout quickly - bugfix for vbi hangs during streaming
  [media] cx23885: remove channel dump diagnostics when a vbi buffer times out
  ...

Fix up trivial conflicts in drivers/misc/altera-stapl/altera.c (header
file rename vs add)
2011-10-31 15:42:54 -07:00
..
association.h
atmel_usba_udc.h
audio-v2.h
audio.h
c67x00.h
cdc.h
ch9.h Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 2011-10-28 14:25:01 -07:00
ch11.h
composite.h usb: gadget: add SuperSpeed support to the Gadget Framework 2011-07-01 14:27:05 -07:00
ehci_def.h
functionfs.h
g_hid.h
g_printer.h
gadget.h usb: gadget: fix typo for default U1/U2 exit latencies 2011-10-13 20:39:59 +03:00
gadgetfs.h
gpio_vbus.h
hcd.h USB: fix ehci alignment error 2011-10-10 16:43:53 -07:00
input.h
intel_mid_otg.h
iowarrior.h
irda.h
isp116x.h
isp1362.h
isp1760.h
Kbuild USB: export video.h to the includes available for userspace 2011-09-23 23:07:26 -03:00
langwell_otg.h
langwell_udc.h
m66592.h usb: gadget: m66592-udc: add function for external controller 2011-07-09 01:08:39 +03:00
midi.h
msm_hsusb.h USB: OTG: msm: Implement charger detection 2011-05-06 18:27:48 -07:00
msm_hsusb_hw.h USB: OTG: msm: Add PHY suspend support for MSM8960 2011-05-06 18:27:49 -07:00
musb.h
net2280.h
otg.h
quirks.h
r8a66597.h usb: gadget: r8a66597-udc: add support for SUDMAC 2011-10-13 20:38:39 +03:00
renesas_usbhs.h usb: gadget: renesas_usbhs: support otg pin control 2011-10-13 20:41:47 +03:00
rndis_host.h
serial.h
sl811.h
storage.h
tmc.h
ulpi.h
usbnet.h
video.h
wusb-wa.h
wusb.h